GitLab

test plan:
 * go to a question bank and move multiple questions
 * it should show you the list of questions, instead of
   constantly loading them

Change-Id: I3ecfdbcee1b5c3e4b989c60fbef81642efef7926
Reviewed-on: https://gerrit.instructure.com/9106

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>

fix a bug in the javascript for managing student groups that caused problems
with managing them from the account level, do to the fact that students aren't
part of sections at that level.

test-plan:
- go to accounts/x/groups
- create a new set of groups
- make sure the student list loads, and you can drag students back and forth.

Change-Id: I0b41294f054de2fdf1e8b330b963edf0a8a956d6
Reviewed-on: https://gerrit.instructure.com/9084

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>

this is so evil

test plan:
  * run rake canvas:compile_assets, and verify that the api
    documentation gets built after js:build runs

Change-Id: If931f39735855b13e09ee773f296f24b555b3dc1
Reviewed-on: https://gerrit.instructure.com/9096

Reviewed-by: Ryan Florence <ryanf@instructure.com>
Tested-by: Brian Palmer <brianp@instructure.com>

when a user includes a global javascript include, make sure that
jquery has been loaded and is available for use.

Change-Id: I4506a28355c4015f2a015faff4d50f699fb4a615
Reviewed-on: https://gerrit.instructure.com/9071

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>

fixes #7393

If it wasn't a kaltura media comment (youtube, etc) it would fail trying
to do a nil.gsub

test plan:
  * create an assignment and embed a youtube video in the description
  * submit the assignment, make a comment on the submission
  * go to conversations and view your submisison comment, verify there
    is no error

Change-Id: Ic5e36076d59da45776e8a5f279927bdb3ce2fb16
Reviewed-on: https://gerrit.instructure.com/8975

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>

fixes #7159

test plan:
 * import two users with the same e-mail into the same account
 * the user should not get a merge notification e-mail

Change-Id: Ic9f3a3948df1e2a877fcd8e79f3d05d86a2d1e5b
Reviewed-on: https://gerrit.instructure.com/8774

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>

fixes #5577

Test plan:
- make a quiz with a formula question
- give the question some margin of error
- preview the quiz and answer the question wrong (but within the margin
  of error)
- the answer should be considered correct

Change-Id: I1a20c698dc017ff556daaa9e8916fb55543d0141
Reviewed-on: https://gerrit.instructure.com/8900

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>

we never add/remove migrations while code is running, and expect to
pick up the changes without restarting the process, so this is fine

test plan: n/a

Change-Id: I8420e99bc32b0eb5b166e870b31d8bdb02a7b164
Reviewed-on: https://gerrit.instructure.com/9010

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>

test plan:
  * configure syslog logging in your development environment
  * set "include_pid: true" in your log configuration
  * verify that log lines include the proc pid after the process name

Change-Id: I29414acb0b6f7cba06765520b1fb4caf67ebe1a4
Reviewed-on: https://gerrit.instructure.com/9026

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>

test plan:
  * perform an action that generates a delayed message, like grading an
    assignment
  * change the grade on the assignment to generate another message
  * wait 30 minutes, and very you only got the second message

Change-Id: I7aeccfb9db705ed3403e8927776a039403cabf27
Reviewed-on: https://gerrit.instructure.com/8944

Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>

FileInContext (used by the zip importer) was bypassing the filename= setter
for Attachment, so when using attachment_fu, sanitize_filename was not getting
called on the filename. This resulted in us generating S3 urls with characters
in them like filename[0].txt. That normally worked fine. However, Firefox
would escape those characters when redirected to a URL like that, which would
cause a signature mismatch with S3.

This commit stops bypassing the filename= setter so files uploaded as zip
files and in migrations have escaped filenames. Because of difficulties
testing S3 attachments, the included spec is weak.

This also includes a migration that will rename attachments with []" in their
filenames, and make a copy of the S3 object to match.

There is also an unrelated spec refactor around faking out a portion of the
code about S3.

test plan:
 * Enable S3
 * Create a ZIP file with a file in it with a name like test[0].bin
 * Upload that ZIP file to your files are, choosing to unpack the ZIP contents
 * Verify that you can download the extracted file using firefox
 * Also verify that the attachment's filename is escaped in the db

Change-Id: I54fc0682b64a9e0021b4b41236f8cab168a0e56e
Reviewed-on: https://gerrit.instructure.com/8875

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>

fixes #7166

test plan:
 * create a user in another account
 * login with that user at the default account
 * should get a warning about needing to log in
   at the correct account

Change-Id: I976d51f0e3f18f0b4a9c7303bf9f71668c8c1f2b
Reviewed-on: https://gerrit.instructure.com/8745

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>

test plan:
1. create an assignment, submit it as student
2. as teach, go to the assignment submission page
   at /courses/:course_id/assignments/:assignment_id/submissions/:student_id
3. Click "media comment", record something
4. Do it again, it should add both to the sidebar

previously it wouldn't submit the second comment

Change-Id: I7911ff3071db5e0bc97b6eb59190da15324ef3bf
Reviewed-on: https://gerrit.instructure.com/8863

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>

Chrome was getting upset by commas not being escaped in the UTF-8 portion of
the content-disposition header for S3 urls. It saw the comma and thought it
was ending the header, and complained of duplicate headers and a header
splitting attack. This will escape all non-[A-Za-z0-9.] characters, which
should be aggressive enough. This was tested in IE, Safari, Chrome, and
Firefox and appears to not cause problems.

test plan:
 * Enable S3 for your dev environment
 * Upload a file with a comma in the name
 * Ensure that you can download that file using at least Chrome 17.

Change-Id: Id229dedc9acc78bdbfe74ddc001fc31a305af0ea
Reviewed-on: https://gerrit.instructure.com/8833

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>

Change-Id: I8f25d8c01e704813a2ccc8dc3dbf65f34a9f7d0d
Reviewed-on: https://gerrit.instructure.com/8853

Reviewed-by: Ryan Florence <ryanf@instructure.com>
Tested-by: Hudson <hudson@instructure.com>

Change-Id: I69b66c9a890383598e1e6a5725d5cf921a39cd93
Reviewed-on: https://gerrit.instructure.com/8753

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>

Change-Id: I2fe93ce571bb61c99f01fb9b28de473f95760746
Reviewed-on: https://gerrit.instructure.com/8788

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>

The old calendar allows admins to view the calendar for a course they
are not enrolled in, via the include_contexts parameter. This adds that
same functionality to calendar2 and the calendar event api, and makes
sure that the redirect from calendar -> calendar2 doesn't lose the
parameter.

test plan:
  * as an account admin, go to a course in your account that you do not
    have any enrollments for. make sure the account has calendar2 enabled.
  * on the course settings page there will be a link to the course calendar.
  * click the calendar link, and verify that the behavior for calendar2
    is the same as with the old calendar -- the course calendar will be
    displayed, all other calendars will be disabled by default, etc

  * make an api call to calendar_events with the context code of the
    same course. verify that you get events from that course back.

Change-Id: Iaa49337b06fe37b0174d8f5ac9bc854353d7fcfa
Reviewed-on: https://gerrit.instructure.com/8693

Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>

admin can now create user with no sis_user_id without receiving
an error about the sis id already existing.

also includes a migration to set all empty string sis_user_ids to
NULL.

test plan:
  * enable sis imports on an account;
  * as an admin in that account, create a new user, leaving the
    sis id blank;
  * create a second new user, also with a blank sis id;
  * verify that the second user is creating without any errors.

test plan:

Change-Id: Ia247c58e0070a4b02ecc584c18ed20bb5c05dcd3
Reviewed-on: https://gerrit.instructure.com/8665

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>

"should not change the message preview/timestamp if the deleted
nessage was by a non-participant" was randomly failing due to
a timestamp comparison.

Change-Id: I1ef86d7990e104b84c6f455fd14df70b8c506903
Reviewed-on: https://gerrit.instructure.com/8771

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>

before both the cancel and send buttons said
"loading…" while it was sending

now the "Send" button says "Sending…"
and "Cancel" does not change

Change-Id: I212d8ad10d0991d8b90f2098a7b3c2219d1149ce
Reviewed-on: https://gerrit.instructure.com/8766

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>

test plan:
 * set a custom stylesheet for site admin
 * look at the page source, and make sure it is there exactly once

Change-Id: I7f595fc70ca7ccddca6376c7dd754b4d696f40a2
Reviewed-on: https://gerrit.instructure.com/8523

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>

refs #7273

this is to add term or other parameters for reports
that need to be configured so admin does not need to
download to see what the last report was

this is needed for https://gerrit.instructure.com/#change,8724
spec is also in other commit ^

test plan
 * Add extra text to report
 * make sure extra text is visibale

Change-Id: I8a8c401f5ab5b50cf81486b6615302cde9e113ad
Reviewed-on: https://gerrit.instructure.com/8741

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>

updated stats and related specs for situations in which there is very little data and we want quartiles.

Change-Id: Ic0610e536fc92e586f5b39bbd4a7080ccc8e522a
Reviewed-on: https://gerrit.instructure.com/8231

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>

rake db:migrate:predeploy and db:migrate:postdeploy only run so-tagged
migrations.  Additionally a migration tagged as both (i.e. an idempotent
data migration) will not be marked as run during predeploy, even though
it is run.

test plan:
 * mark some existing migrations with pre or post deploy, unmigrate them,
   and verify db:pending_migrations shows their tags, and the appropriate
   rake task runs the correct migrations, and marks them as run
   appropriately

Change-Id: I8a787c5f08fe0ab6855cce759aa4eef6de5045d2
Reviewed-on: https://gerrit.instructure.com/8472

Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>

also changed json error response to include existing reservation info
when the reserve call fails

test plan:
1. ensure you can reserve normally
2. ensure you get an error if you have already reached your limit
3. ensure your existing reservations get deleted if you set cancel_existing

Change-Id: Icb2d98eb52c3289984ac437ba14f33411122ce0f
Reviewed-on: https://gerrit.instructure.com/8689

Reviewed-by: Zach Pendleton <zachp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>

paginate enrollments by loading them through the api. load
new pages by clicking 'View More Enrollments' link.

affects: sections controller
test plan:
  * create course with large number of students (~ 500);
  * visit course section page (/courses/:course_id/sections/:id);
  * verify that page loads first 15 of both current and completed
    enrollments;
  * verify that if no enrollments exist in a category, a 'no enrollments
    found' message is displayed;
  * verify that clicking 'Load More Enrollments' loads another page
    of enrollments;
  * load a course with < 15 enrollments, verify that no 'View More
    Enrollments' link is displayed.

Change-Id: Ied7ccdd8e59a56bef44ffbb07292ecfc0cb97ec5
Reviewed-on: https://gerrit.instructure.com/8365

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>

test plan:
 * run the migrations against postgres - confirm by looking at logs
   that most migrations run in a transaction, but those modified
   here do not

Change-Id: I4820d982e2ce6abd21bde0c882b3177c3f11984e
Reviewed-on: https://gerrit.instructure.com/8456

Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>

adds ability to filter by user or group to the existing filter/finder.

also implements loading animation when a filter is selected for better
visual feedback before the page refresh (stopgap until we implement ajax
reloading).

also fixes a regression where the course name stopped appearing next
to groups and sections when searching at the top level.

test plan:
1. test user filtering
   1. start a private conversation with a user
   2. start a group conversation with a user
   3. filter conversations by that user
   4. ensure that both conversations appear
2. test group filtering
   1. start a group conversation with a student group as a recipient
   2. filter conversations by that group
   3. ensure that the conversation appears

Change-Id: I52102d9a62c76812af9af4374751f4469c46bc0d
Reviewed-on: https://gerrit.instructure.com/8673

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>

this commit does two things:
  1. remove user name from quiz statistics csv for anonymous
     graded quizzes;
  2. remove user answers from speed grader assignment details.

test plan:
  * create an anonymous graded quiz;
  * take the quiz as a student;
  * as instructor/admin, download the quiz statistics csv and
    verify that user's name isn't included;
  * as instructor/admin, visit the speed grader for the assignment
    and verify that a message about the user submitting the
    assignment is displayed instead of the user's answers.

Change-Id: Id5a7b357a4c30b525ba352c0cda7550a37af1132
Reviewed-on: https://gerrit.instructure.com/8441

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>

these dead statistics pages were the only ones using it; with them gone
there's no barrier to upgrade.

raphael upgraded to v2.0.2 (commit 2b0c5a2 on
https://github.com/DmitryBaranovskiy/raphael)

g.raphael upgraded to v0.5 (commit b083f60 on
https://github.com/DmitryBaranovskiy/g.raphael)

removed the minified versions since we weren't using them (we
auto-minify the others)

Change-Id: I0cd9a3a68125ed26785fc9999bac7bbc3aaf10b1
Reviewed-on: https://gerrit.instructure.com/8769

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>

Change-Id: I9361a55a4a3dc11b4d6db2a92b7a6b938d43618b
Reviewed-on: https://gerrit.instructure.com/8767

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>

Rails expects plugins to not extend the app, but provide services for
the app, so it loads plugin tasks first, then the app tasks.  So for
a plugin to modify the behavior of these tasks, it has to manually
require the file.  But Rails will then re-load the file, and due to
how Rake works, these tasks will all be duplicated.  So do manual
single-loading.

test plan:
 * make sure rake db:pending_migrations still works

Change-Id: I54458a085ee1b771093734d069472a55c4309d25
Reviewed-on: https://gerrit.instructure.com/8483

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>

make it so all sent bulk private messages appear under the sent filter,
even if the conversation doesn't appear in the inbox (i.e. the student
hasn't replied yet)

incidentally fixed #5370 while refactoring $form.formSubmit -> success

test plan:
1. pick the "sent" filter
2. send a bulk private message to people you don't already have a
   conversation with
3. ensure the conversations and messages show up
4. reload the page and confirm that they still appear
5. compose a new message to one of those users (via new message
   form, don't select the conversation)
6. confirm the already-existing private conversation gets auto-selected
   after the form submits

Change-Id: I9ce9e75db2292827531e301862dc69eb47504b56
Reviewed-on: https://gerrit.instructure.com/8764

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>

Change-Id: Ia2df0322b036f2206b17cad82082bbdb58ff2ac0
Reviewed-on: https://gerrit.instructure.com/8675

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>

test plan:
  * run specs

Change-Id: I2c61c431004439dae7f8ad1cd350a220e1ecd044
Reviewed-on: https://gerrit.instructure.com/8750

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>

Change-Id: I97a9fe7eccb1f64ab3f6e7cb4e853c0276f53cee
Reviewed-on: https://gerrit.instructure.com/8744

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>

fix - calendar2 selenium spec

Change-Id: If0584af94bf0e65f4ecef59ece9f3175db5c95ef
Reviewed-on: https://gerrit.instructure.com/8763

Reviewed-by: Bryan Madsen <bryan@instructure.com>
Tested-by: Hudson <hudson@instructure.com>

Change-Id: I3741aacea14b1d24893082f2d160fbc12b41d716
Reviewed-on: https://gerrit.instructure.com/8749

Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>