Commit Graph

9619 Commits

Author SHA1 Message Date
Jeremy Stanley a6446e5e37 allow unpublished module items to be reordered
test plan:
 - have a course with draft state enabled
 - have a bunch of unpublished module items
 - reorder them
 - reload the page and make sure the order sticks

fixes CNVS-10906

Change-Id: I47713b454cce41330803eb742455697b4a26e0b0
Reviewed-on: https://gerrit.instructure.com/29591
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
2014-02-07 18:16:48 +00:00
James Williams aadea501ed use action view erubis for rails 3
Change-Id: I1f9cb0a894ce7a1af63b03d432396f7d911c5bf6
Reviewed-on: https://gerrit.instructure.com/29790
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-02-07 17:26:33 +00:00
James Williams d4fba8bc78 pin all the gems
Change-Id: I7f02aa4794f91aebc2fe3d02e249ef00ab3c80dd
Reviewed-on: https://gerrit.instructure.com/29784
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
2014-02-07 16:44:22 +00:00
Cody Cutrer 0b2f1bb182 fix references to the default shard settings for rails 3
Change-Id: Ie35fd3d9255c934d29799f99596fb65e75181947
Reviewed-on: https://gerrit.instructure.com/29599
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-02-07 15:21:22 +00:00
Cody Cutrer 4b48998179 fix usages of scoped? to check rails 3 style x_values
Change-Id: I75142f6a2d758e1f672a79ecf3c7da69ba5c8f30
Reviewed-on: https://gerrit.instructure.com/29558
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-02-07 15:18:42 +00:00
Cody Cutrer 2c2358ebe9 force the shard for User.of_account
fixes cross shard user search by id for rails 3

prevents the where from inferring the user's home shard, cause this query
really needs to happen on the account's shard

Change-Id: I0a3539be638ece276b8fb33f87c75e8a33ab51ef
Reviewed-on: https://gerrit.instructure.com/29589
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-02-07 15:18:29 +00:00
Cody Cutrer 0fef098577 fix most assignments controller specs in rails 3
Change-Id: Ib96144c0cdd4be1c9599dd722cfaa7d9fcd1cdcf
Reviewed-on: https://gerrit.instructure.com/29778
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-02-07 15:18:00 +00:00
Cameron Sutter 7ce30222bd set focus for assignment muter dialogs
fixes CNVS-10555

test plan:
 In screenreader gradebook and gradebook2
  - open the assignment muter dialog
  - focus should be on the content of the dialog

Change-Id: Id4972ebef2f9a496b984bd0e799172844ffbb158
Reviewed-on: https://gerrit.instructure.com/29309
Reviewed-by: Matthew Irish <mirish@instructure.com>
Product-Review: Aaron Cannon <acannon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
2014-02-07 03:57:00 +00:00
Derek DeVries 2d5ca8af7c rails3 specs for user lists controller
Change-Id: I598012d4e12c755e7d34398bdbf43836dece8563
Reviewed-on: https://gerrit.instructure.com/29770
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
QA-Review: Derek DeVries <ddevries@instructure.com>
2014-02-07 03:17:09 +00:00
Derek DeVries 83ad124981 rails3 spec fixes for tokens controller
Change-Id: I132adfbd015504e1c3667d03ab7f9953793b770e
Reviewed-on: https://gerrit.instructure.com/29777
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
QA-Review: Derek DeVries <ddevries@instructure.com>
2014-02-07 02:41:44 +00:00
Derek DeVries bfb87df0ad rails3 spec fixes for submission comments controller
Change-Id: Ibb6b4371bcf2716a4056bb4604809a1369441e42
Reviewed-on: https://gerrit.instructure.com/29769
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
QA-Review: Derek DeVries <ddevries@instructure.com>
2014-02-07 02:41:34 +00:00
Derek DeVries 1aa820cece fix creating quiz groups from the banks dialog
fixes CNVS-10130

test plan:
  - Edit existing quiz
  - Go to the questions tab
  - "Find Questions" button
  - Select the group
  - In the "Add questions to the quiz group:" drop down, select "[New Group]"
  - Fill out the form with sane values
  - "Create Group" button
  - The group should be created successfully

Change-Id: I4197a3296d708b203ede265e7774456ec44ee894
Reviewed-on: https://gerrit.instructure.com/29763
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
2014-02-07 02:39:39 +00:00
Jeremy Stanley cd1acf8259 localize the course home page
fixes CNVS-2607

test plan:
 - set the language for a course to something other than English
 - view the course home page
 - that language should be used
 - other courses' home pages/other pages should be unaffected

Change-Id: Ibee1b22003871ff942ad2f46e98073f12c449377
Reviewed-on: https://gerrit.instructure.com/29617
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2014-02-07 00:29:28 +00:00
Jeremy Stanley 407de588ba include custom students in course group category lists
test plan:
 - create a custom student role
 - enroll one or more students in a course with this role
 - also enroll some normal students
 - go to the groups page, and create a group set
 - both normal students and custom students should show up
   in the "unassigned" list and be assignable to groups
 - if you divide students into groups automatically, both
   custom and normal students should be assigned

fixes CNVS-10434

Change-Id: Ib609af34063e10af605c8d8e11cde50d1fee967a
Reviewed-on: https://gerrit.instructure.com/29667
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
2014-02-07 00:29:10 +00:00
Rob Orton 06bbebe78d optimize user_access_report query
fixes CNVS-11007

test plan
 - specs should pass

Change-Id: I9acf26fc857096c172f5f2467fba29e895041758
Reviewed-on: https://gerrit.instructure.com/29755
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-02-06 23:58:14 +00:00
Jeremy Stanley 56dd02c8a1 don't fail module api PUT when position doesn't change
test plan:
 - enable draft state
 - go to modules page
 - publish a module and ensure the cloud icon changes
 - unpublish a module and ensure it changes back, without
   having to reload the page
 - repeat the two previous steps a couple of times

fixes CNVS-10829

Change-Id: I0806a29ccb9d1ff8e37e31e26e6eb39b3aa90fac
Reviewed-on: https://gerrit.instructure.com/29555
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
2014-02-06 23:30:45 +00:00
Landon Wilkins 30ac87c5d3 converts terms/index js_block into js_bundle
test plan:
* regression test term index

Change-Id: I9e37b1676beb19a3e49efde78d6b1b051f5b6bdf
Reviewed-on: https://gerrit.instructure.com/29099
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
2014-02-06 23:29:30 +00:00
Raphael Weiner 084f81d761 add lti user, lti roles, lit tool, lit assignment, and lti context creators
also refactored add_variable_mapping to be more explicit

Change-Id: I38b21975ae80cf510f81bfba84ece7b3b568bfa9
Reviewed-on: https://gerrit.instructure.com/29241
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Stephan Hagemann <stephan@pivotallabs.com>
Product-Review: Stephan Hagemann <stephan@pivotallabs.com>
QA-Review: Brad Humphrey <brad@instructure.com>
2014-02-06 22:14:41 +00:00
James Williams 52a4214801 fix messagable user for rails 3
Change-Id: I900b72d0e72c43dee1060ab2cee051d461ab8e4d
Reviewed-on: https://gerrit.instructure.com/29712
Reviewed-by: Cameron Matheson <cameron@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Ryan Florence <ryanf@instructure.com>
Product-Review: Cameron Matheson <cameron@instructure.com>
QA-Review: Cameron Matheson <cameron@instructure.com>
2014-02-06 21:47:53 +00:00
Landon Wilkins 7ba3ae7960 convert add_assignment js_block to js_bundle
test plan:
* regression on adding assignment

Change-Id: I34b0a7b9ec728bcda2c06aa2635f694c3c7d8d49
Reviewed-on: https://gerrit.instructure.com/29075
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
2014-02-06 21:41:56 +00:00
Landon Wilkins 585eef5ba1 convert courses/show js_block into js_bundle
test plan:
* regression test course show page

Change-Id: Ic80d5c718496fb0cf7e36044606275f6dca9c43b
Reviewed-on: https://gerrit.instructure.com/29156
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
2014-02-06 20:31:49 +00:00
Derek DeVries c87397517a fix failing spec on quiz
fixed:
- since we're not explicitly checking for errors in quiz_submission#save, throw
  an exception if an error happens.
- fix error formatting assertion

Change-Id: I1ac2134a965d329e733c8f54ed2786e06adff91e
Reviewed-on: https://gerrit.instructure.com/29703
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
QA-Review: Derek DeVries <ddevries@instructure.com>
2014-02-06 20:07:36 +00:00
Jeremy Stanley a3cf4748cc check size of actual zip contents against quota
because the zip central directory can lie

test plan:
 1. Create a huge file (say a gigabyte) where every byte is the
    same.
 2. Zip it. The repeating data will be compressed. The ZIP will
    be tiny but will uncompress to a huge file.
 3. Edit the zip file binary. Open it with a hex editor and
    change the file size in the directory. Make the file
    appear to be small enough to fit into the course quota.
    (The zip file format is documented at
    http://www.pkware.com/documents/casestudies/APPNOTE.TXT
    or ask the committer for help)
 4. Try to import the zip file into a course (migrations/
    import zip file into folder)
 5. You should receive a quota error.

fixes CNVS-10722

Change-Id: Ib1bd1c432ef900f0c6c61ebe6eab2881f8515104
Reviewed-on: https://gerrit.instructure.com/29704
Reviewed-by: Mark Severson <markse@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2014-02-06 19:29:27 +00:00
James Williams 5923a71bb7 fix user_spec favorites specs for rails 3
Change-Id: I7e783504c6134099014254f1fffd68366ab488d1
Reviewed-on: https://gerrit.instructure.com/29717
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-02-06 19:11:49 +00:00
James Williams 545bd1b58d fix update_account_associations for rails 3
Change-Id: I7e0e9db5d4d8f920ce63c4dfcac966783473c39a
Reviewed-on: https://gerrit.instructure.com/29716
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-02-06 19:11:33 +00:00
Braden Anderson ae8fdc6206 UserMerge: move scheduler appointments
fixes CNVS-9716

test plan:
  1. As a teacher, using the scheduler, create a set of appointment groups.
  2. As an admin, create two user accounts, and enroll them into the course
    with the appointment groups.
  3. Sign into each user account and using the scheduler, sign up for
    different scheduled appointment times.
  4. As an admin, merge these two accounts.
  5. As the user, navigate to the Scheduler and observe that the scheduled
    appointment tied to the current account is still tied to the account. but
    the other that is tied to the old account has not updated to reflect being
    tied to the new account.

Change-Id: I69b4b0fd46774d6096b48189132190183ac4eb4a
Reviewed-on: https://gerrit.instructure.com/29640
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Braden Anderson <banderson@instructure.com>
2014-02-06 18:23:04 +00:00
Ahmad Amireh f00ee6ef54 Escape student answers in FIMB questions
Closes CNVS-10154

Test plan
---- ----

  - create a quiz with a FIMB question and take it
  - fill in some answers with single-apostrophes in them (ie: foo'bar)
  - refresh the take-quiz page
  - verify that the answers are still there

Also, you can see the screencast attached to the ticket for info on
reproducing the issue.

Change-Id: I3196860866dfc586b400b241c89421b5ca16ec00
Reviewed-on: https://gerrit.instructure.com/29565
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Product-Review: Ahmad Amireh <ahmad@instructure.com>
2014-02-06 17:55:04 +00:00
Jon Willesen 1d624517c7 spec: rails3 models/pseudonym_spec
Pseudonym#infer_defaults initializes account in a
before_validation callback.

Change-Id: If17ed2cc51bc285d1efae588d8130d5329b8f203
Reviewed-on: https://gerrit.instructure.com/29702
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Product-Review: Jon Willesen <jonw@instructure.com>
QA-Review: Jon Willesen <jonw@instructure.com>
2014-02-06 17:31:32 +00:00
Cameron Matheson ba729fe8d7 fix user service spec
eql? is not true anymore for this array with a user service in it.

Change-Id: I5812f0b42ec17cf9c44b6bc5e31710bba1c00e85
Reviewed-on: https://gerrit.instructure.com/29694
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cameron Matheson <cameron@instructure.com>
QA-Review: Cameron Matheson <cameron@instructure.com>
2014-02-06 16:52:25 +00:00
Cody Cutrer 1b9df6effe fix time_spec for rails 3
Change-Id: I11f26703b4173e6d1ccdf2ef694e781fa7adde70
Reviewed-on: https://gerrit.instructure.com/29695
Reviewed-by: Jon Willesen <jonw@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-02-06 16:33:34 +00:00
Cody Cutrer 576143d795 fix wiki page spec for rails 3
Change-Id: If89faa2ad16eb7846975528cda98cb24bd3f4902
Reviewed-on: https://gerrit.instructure.com/29693
Reviewed-by: Jon Willesen <jonw@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-02-06 16:33:14 +00:00
Cody Cutrer f34511913a fix QuizRegrading::Submission when ActiveSupport isn't around
no need to use present? to check nilness

Change-Id: If7a974d5f1be77a6657f56946a02cf8a51388a91
Reviewed-on: https://gerrit.instructure.com/29684
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-02-06 16:32:53 +00:00
Matthew Irish f5a6f093c9 make never_drop ids string for grade summary ENV
fixes CNVS-10864

test plan
=========

- add drop rules to never drop one or more assignments
- verify that the totals in Gradebook, GB2, and the student grades
  summary page match

Change-Id: I1ac4a31a03b664ac6d3e92bc2cd761c69d2056b5
Reviewed-on: https://gerrit.instructure.com/29619
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Cameron Sutter <csutter@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-02-06 15:29:07 +00:00
Shawn Meredith 937b0b7299 spec: firefox 26 upgrade selenium
Change-Id: I5207da68a1ae77c3255ddaa9e15b07632d930520
Reviewed-on: https://gerrit.instructure.com/29669
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Hannah Bottalla <hannah@instructure.com>
Product-Review: Hannah Bottalla <hannah@instructure.com>
QA-Review: Hannah Bottalla <hannah@instructure.com>
Tested-by: Hannah Bottalla <hannah@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
2014-02-06 02:46:32 +00:00
Jon Willesen 9821de9816 spec: fix rails3 specs in message_spec.rb
Change-Id: Ia844a92b6131c6efecc223cf6b6a4c483369fb7a
Reviewed-on: https://gerrit.instructure.com/29539
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Jon Willesen <jonw@instructure.com>
QA-Review: Jon Willesen <jonw@instructure.com>
2014-02-05 23:20:36 +00:00
Cody Cutrer 6b47a6c1e6 ensure extensions will work for specs with multiple shards
Change-Id: I4ff6ab571f7995469a89f605386e9f6c49718d19
Reviewed-on: https://gerrit.instructure.com/29677
Reviewed-by: Jon Willesen <jonw@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-02-05 22:46:46 +00:00
Jeremy Stanley 0ca6f1f9aa paginate the course list api collection
test plan:
 - have a user enrolled in >10 courses
 - hit the /api/v1/courses endpoint as this user
 - verify that only the first 10 courses are returned
 - verify that you can use ?page=2 to get the next page
   of results

fixes CNVS-10763

Change-Id: I1eae1a46d5c7b049fa19af6a802ab4d9fa499d2b
Reviewed-on: https://gerrit.instructure.com/29542
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Mark Severson <markse@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
2014-02-05 22:27:27 +00:00
Jon Willesen 7246f48506 spec: rails3 models/profile_spec
Change-Id: Ida45760eb86aca62a64e1c05c092ab23d5e88b2e
Reviewed-on: https://gerrit.instructure.com/29662
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Jon Willesen <jonw@instructure.com>
QA-Review: Jon Willesen <jonw@instructure.com>
2014-02-05 22:27:14 +00:00
Michael Nomitch 46a0cfa0fd remove total grade tooltip when groups are weighted
fixes CNVS-10777

test plan:
- As teacher go to GB2
  - When assignment groups are weighted, total grade should not have a tooltip
  - When assignment groups are not weighted, tooltip should display normally
- As a student to to grade summary page
  - When assignment groups are weighted, total grade should not have a tooltip
  - When assignment groups are not weighted, tooltip should display normally

Change-Id: I80db6ddfff15116a2660e387fc517149cfc0f602
Reviewed-on: https://gerrit.instructure.com/29279
Reviewed-by: Matthew Irish <mirish@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Mike Nomitch <mnomitch@instructure.com>
2014-02-05 22:23:47 +00:00
Landon Wilkins 8e5687a45a converts users/registered js_block into js_bundle
test plan:
* regression test user registration

Change-Id: Ib4426f4c4a38a96fe0c2c3327019de796f47cd93
Reviewed-on: https://gerrit.instructure.com/29093
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
2014-02-05 22:02:09 +00:00
Landon Wilkins 600550589a converts users/index js_block into js_bundle
test plan:
* regression test user index

Change-Id: I514ebef4be0ee0e42c2ad5607da330010dd8a832
Reviewed-on: https://gerrit.instructure.com/29094
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
2014-02-05 22:01:50 +00:00
Landon Wilkins 215980d31f removes unnecessary shared/_accounts_right_side_shared js_block
test plan:
* n/a

Change-Id: If321513dd2b25ff0e5f08c3113d03fae1449c988
Reviewed-on: https://gerrit.instructure.com/29113
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
2014-02-05 22:01:34 +00:00
Landon Wilkins 5384fe4c3e converts files/full_index js_block into js_bundle
test plan:
* regression files full_index

Change-Id: I60c5e079e0dc513bcc40de5c6ff65c7b722767c0
Reviewed-on: https://gerrit.instructure.com/29147
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
2014-02-05 22:01:21 +00:00
Landon Wilkins 09cdb59aa4 converts context/roster_user_usage js_block into js_bundle
test plan:
* regression test roster user usage

Change-Id: Idc50b85717ed6f88dd0967aee4b696695509bab5
Reviewed-on: https://gerrit.instructure.com/29159
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
2014-02-05 22:00:56 +00:00
Landon Wilkins d11ff2ff10 converts context/media_object_inline js_block into js_bundle
test plan:
* regression test context media object inline

Change-Id: If5a7685f53cba1b5a83b97b7d55f6554b1daff40
Reviewed-on: https://gerrit.instructure.com/29164
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2014-02-05 22:00:31 +00:00
Cody Cutrer 510e6eee86 clear schema information during db:test:reset
Change-Id: I3fb4e3df3bf8a7d305cb27d4e79e8454580f9c2a
Reviewed-on: https://gerrit.instructure.com/29676
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-02-05 21:47:30 +00:00
James Williams c13845ce0f use assign_attributes instead of attributes= for rails 3 compatibility
Change-Id: I783618bc5457ea53a9d59ab36d3ccf7b7fde7b2e
Reviewed-on: https://gerrit.instructure.com/29595
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-02-05 20:56:38 +00:00
James Williams 585ae48121 fix lib/limporter specs for rails 3
Change-Id: Ie68af02a84ce4149869f4ade51d51c44c3f9b022
Reviewed-on: https://gerrit.instructure.com/29649
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-02-05 20:20:11 +00:00
Landon Wilkins e8438ace7c converts add_group_category js_block into js_bundle
test plan:
* regression test add group category results

Change-Id: I1933791d655eadfdb59cb50c5f7111b10e79cd8d
Reviewed-on: https://gerrit.instructure.com/29141
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Marc LeGendre <marc@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
2014-02-05 20:11:16 +00:00
James Williams c3de2682cb explicitly save quiz submissions for rails 3 compatibility
touch no longer runs save callbacks

Change-Id: I1a0e703cfc196c77cba91d233f10a1e8ee138196
Reviewed-on: https://gerrit.instructure.com/29575
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-02-05 19:44:43 +00:00