rails3: fix sidebar buttons on people page

Change-Id: I66199fef9133c3e976448169fd6bfa7652ca03f8
Reviewed-on: https://gerrit.instructure.com/31254
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>
rails3: fix issues found in integration/security_spec

Change-Id: Ic88b58865135694dd510fecec4ec21d44eea09a1
Reviewed-on: https://gerrit.instructure.com/31010
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
fix assignment external_tool_tag resetting for rails 3

Change-Id: I0c2c1311caea731dde7822b97876cefdcc45d518
Reviewed-on: https://gerrit.instructure.com/31256
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>
treesame commit of origin/stable/2014-03-01

Treesame-Commit-Id: ba3a5ff19584d2ec495945da9e00aaa2c1e417df
fix postgres quoting in rails 3

already fixed, just need to move it out of the CANVAS_RAILS2 branch.

also, we don't care about quoting of money or binary columns, and the
default quoting of them changed from rails 2 to rails 3, so don't test
them

Change-Id: I26a556020ec672ff2818470b503aa9f0961a98e4
Reviewed-on: https://gerrit.instructure.com/30307
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>
fix preload and eager load with join-dependent conditions for rails 3

Change-Id: Ib642896f5f09976bf29dd7de291917963bbad2df
Reviewed-on: https://gerrit.instructure.com/31240
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>
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>
fix collection proxy respond_to for rails 3

Change-Id: Ife5a250838daf399b00e8d24f037da0998b7e2e8
Reviewed-on: https://gerrit.instructure.com/31314
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>
remove one other instance of `git ls-files`

Change-Id: I44d335eb9cc93442b592758733f1912ba46fddf8
Reviewed-on: https://gerrit.instructure.com/31218
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Raphael Weiner <rweiner@pivotallabs.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
uses conversation context tags for notifications

fixes CNVS-11269

test plan
- start conversations and send messages from new and old
 conversations between users who share no contexts, one context,
 two context, and >2 contexts
- ensure that the notification emails include shared courses next
 to the author's name
- ensure that messages sent from new conversations only include
 the selected context next to the author name

Change-Id: Ibc05752100dfb4b139c8dce64cfe1985987c6467
Reviewed-on: https://gerrit.instructure.com/30778
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
fallback on activerecord.errors translation scope for rails 3

Change-Id: I01c2a9a5e55eaa35ae377dc27a9d80fb9d42ad8a
Reviewed-on: https://gerrit.instructure.com/31306
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>
require MFA when logging in if any of your accounts require it

Change-Id: I00af208aa8dd8d1aa9daeba34732538eb20430c4
Reviewed-on: https://gerrit.instructure.com/31232
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>
sanity check cache_store.yml and warn of misconfig

test-plan:
 - create a cache_store.yml that's not a hash
 - try to boot canvas, get an appropriate error
 - create a cache_store.yml with non-hash values for the top level keys
   (e.g. entire file is "cache_store: redis_store")
 - try to boot canvas, get an appropriate error

Change-Id: I4e8965a61c11c64e1d81894e8ae316761ac12f1b
Reviewed-on: https://gerrit.instructure.com/29663
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
QA-Review: Jacob Fugal <jacob@instructure.com>
implement i18n scope assignment for partial rendering in rails 3

Change-Id: Ife8b5b2558dfd21d35d709e78d14273f78ae1ef9
Reviewed-on: https://gerrit.instructure.com/31326
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>
rails3: remove duplicate route with useless :format

Change-Id: Ib9dd810631b3745938f332e485f6184942368596
Reviewed-on: https://gerrit.instructure.com/31289
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>
guard: print handlebars errors

fixes CNVS-11640

test plan:
  * start guard
  * introduce a syntax error in a handlebars file
  * verify that the error is displayed

Change-Id: I17f624a709c96dfbd9114b4c7204c8bec51cd425
Reviewed-on: https://gerrit.instructure.com/31340
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Braden Anderson <banderson@instructure.com>
fix discussion_topic importing into groups

test plan:
* create a course with a discussion topic
* export the course
* create a new course
* add a user group in the new course
* import the package into the course
* should not fail or import as a group topic

fixes #CNVS-11377

Change-Id: Ied4c80ed48d6495bdee60f79948445141997d5e8
Reviewed-on: https://gerrit.instructure.com/31087
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@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>