Updated es translation
set max_attempts on SummaryMessageConsolidator job

if it fails, the periodic job will reschedule soon anyway, and we don't
want one bad shard backing everything up

Change-Id: I49bd2a9b0f3cd399deb2424e0382f8d54fd483ce
Reviewed-on: https://gerrit.instructure.com/31148
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
temporarily raise default_per_page on list courses

this endpoint was originally non-paginated. it was appropriate to make
it paginated (it was documented as paginated, and we cannot leave it
unpaginated), but we should have communicated and given a grace period
for endpoint consumers to prepare first.

temporarily raise the default per_page while they catch up.

fixes CNVS-11574

Change-Id: I853dadd9a093dac555d3a240aa64d275d040b29b
Reviewed-on: https://gerrit.instructure.com/31209
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Miles Wright <mwright@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
don't fail migration if account isn't found

it'll just mark the attachment as broken

Change-Id: Ifefb66178d905505b2658b695f148c4f6895c7f6
Reviewed-on: https://gerrit.instructure.com/31170
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
fix module item footer for quizzes

fixes CNVS-11540

when a url was built with the model name it replaced the namespace model
string of "quizzes/quiz" with "quizzes:quiz" so that the slash wouldn't mess
up the url. We need to translate this back before attempting to classify
the quiz string back to the class name.

test plan:
- add a quiz to a module with something before and after it in the module
- navigate to the quiz from the module
- the footer with prev/next links should appear

Change-Id: I559b646fb799f48c6782dc554eb26dca7f6b348b
Reviewed-on: https://gerrit.instructure.com/31215
QA-Review: Myller de Araujo <myller@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Josh Simpson <jsimpson@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
add IDS_PER_SHARD stub

test plan
 - run migrations with just canvas-lms
 - migrations should not fail

Change-Id: I489fd5c89457771ae2d21a7d110274d3843b3062
Reviewed-on: https://gerrit.instructure.com/31264
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
remove unneccessary collection data fix up

fixes CNVS-11620

test plan
 - run migrations
 - should not error

Change-Id: I63e137f3c3154d1c0b64d2bbfd110a26f748a1f2
Reviewed-on: https://gerrit.instructure.com/31304
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
don't add verifiers to locked file links

test plan:
 - have a course with a public syllabus
 - link to two files in the syllabus body:
   - a locked file
   - an unlocked file
 - access the course syllabus without logging in
   - the unlocked file link should work
   - the locked file link should not

fixes CNVS-11569

Change-Id: I75d25a46c7e4fac43c7f187a4aba166be85d1010
Reviewed-on: https://gerrit.instructure.com/31270
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>

Conflicts:
	spec/lib/user_content_spec.rb
fix bug where essay questions answers not saved

closes CNVS-11603

test plan:
  - as an instructor
    - create and publish a quiz that:
      - has an essay question
      - has a time limit
      - allows students to see their submitted answers
  - as a student
    - start quiz
    - enter something via the RCE for the essay question (dont submit)
    - allow time to expire on the quiz
    - click 'Ok, fine' in the 'Times up' modal dialog that pops up
  - your answer should be displayed in the following quiz summary page

Change-Id: I0f8bc7ff177f3cd012ec8311fad631ec2f519348
Reviewed-on: https://gerrit.instructure.com/31403
Reviewed-by: Derek DeVries <ddevries@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
only allow deleting enrollments from course in path

fixes CNVS-11685

test plan
 - delete an enrollment using the api
 - should only allow deleting from the specified course

Change-Id: I5ae0754b0322a2f6fa0817ce15e41a885c88cf2d
Reviewed-on: https://gerrit.instructure.com/31468
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
Add copyright disclaimer (Start a New/Publish Course)
override Quiz#context_module_tags to find both content_types

test plan:
 - have a quiz that was added to a module prior to the
   Quizzes::Quiz refactor
   (or manually update the ContentTag's content_type to 'Quiz')
 - set up a completion requirement (must submit, or must score)
 - verify that a student can complete the requirement

fixes CNVS-11613

Change-Id: I2bb5271e6b263173d98c9df8913044640698e7fb
Reviewed-on: https://gerrit.instructure.com/31424
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
Merge tag 'release/2014-03-01.20' into edge

canvas release release/2014-03-01.20

Conflicts:
	lib/stubs/shard.rb
stub out databaseserver for rails 2

Change-Id: Icb8fada01a94e5c3122f74db340c69fa1b2959d2
Reviewed-on: https://gerrit.instructure.com/31701
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Merge pull request #149 from va7map/feature-copyright

Add copyright disclaimer (Start a New Course form + Publish Course button)
Update copyright disclaimer copy and link
Merge pull request #150 from va7map/feature-copyright-tweak

Update copyright disclaimer copy and link