Change-Id: I24509dce1a218e67d8438c5405506dcdc711cd33
Reviewed-on: https://gerrit.instructure.com/126702


Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>

the participants cache key will no longer include user. if
indirect_participants are included, additional participants will be
cached per user independant from the base participants.

closes CNVS-39349

test plan:
- test creating/replying to conversations
- ensure participants show for conversation

Change-Id: I6a2269becb2d18d03b8a46b348a428830322686a
Reviewed-on: https://gerrit.instructure.com/126155


Tested-by: Jenkins
Reviewed-by: brian kirkby <bkirkby@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>

also change cache_store reloader to not leave a bad state
if one cluster has invalid config

Change-Id: I711aff6d9dbbadff8a6ea66a6f438781b5c8e19b
Reviewed-on: https://gerrit.instructure.com/126634


Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>

fixes CNVS-39303

test plan
 - set integration_id on user with no sis_id
 - api should have sis_id attribute and
   integration_id

Change-Id: Ia5da25bb9959dbc79aaadd31ea8e8aec36146a23
Reviewed-on: https://gerrit.instructure.com/126053


Tested-by: Jenkins
Reviewed-by: Tyler Pickett <tpickett@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>

Change-Id: I66299d11d7c1f01e4607b794bfcd6fcefd6025a1
Reviewed-on: https://gerrit.instructure.com/124870


Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>

fixes CNVS-39366

QA Notes:

There is only one non-deterministic ways to likely force the
scenario which revealed this bug: Create a bunch of assignments
and custom columns, while using only one student.

This is NOT guaranteed to produce the bad behavior prior to this
commit. However, if the issue is consistent with this setup
before testing this commit and is not present afterward, this
issue should be considered resolved.

test plan:
 1. Create a course with:
    a. 4 grading periods
    b. 10 assignment groups
    c. 40 assignments
    d. 10 custom columns
    e. one student
 2. Check out master
 3. Open Canvas in Chrome with dev tools open to the web console
 4. Visit Old Gradebook
 5. Verify that an error is logged to the console:
    * `something...something removeCellCssStyles`
 6. Apply this commit
 7. Open Canvas in Chrome with dev tools open to the web console
 8. Visit Old Gradebook
 9. Verify that the error above does not appear
10. Verify that Old Gradebook loads successfully

Extra Note regarding Step 5:

Another indicator that the conditions for this issue are present
is to open the network tab in Chrome dev tools and verify that
the request for submissions completes prior to at least one of
the following other requests:
 * assignment_groups
 * custom_gradebook_columns
 * grading_period_assignments

Observing that this is occurring after the commit is applied will
be verification that the conditions for this issue are still
present without being a bug anymore.

Meow!

Change-Id: I506dc8f1c2ed04f560f9c1fc0e019c32d1ef1e05
Reviewed-on: https://gerrit.instructure.com/126425


Tested-by: Jenkins
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Matt Taylor <mtaylor@instructure.com>
QA-Review: Anju Reddy <areddy@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>

Fixes CNVS-39363

Change-Id: I209bc76e9fee425e1ce17fb9e839a7d1710992ea
Reviewed-on: https://gerrit.instructure.com/126361


Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>

test plan:
- change a course/user feature flag
- the change should stick and apply

Change-Id: I2b4045bf6a0c5c57c58591c98ddcd513e8243fa0
Reviewed-on: https://gerrit.instructure.com/126202


Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>

course notifications now use the course name in the from, so update the
custom account notification name to be more clear about which types of
notifications it applies to.

closes CNVS-39315

test plan:
- view the notifications tab of /accounts/self/settings
- the example text should make sense

Change-Id: I14743932dd9dca3e927de07730a55e25f6d13446
Reviewed-on: https://gerrit.instructure.com/126127


Tested-by: Jenkins
QA-Review: KC Naegle <knaegle@instructure.com>
Reviewed-by: Jonathan Featherstone <jfeatherstone@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>

fixes OUT-1511

test plan:
 - import global outcomes from academic benchmarks to the account
 - see here for details on AB importing:
 - import one of those outcomes into a course
   note: if you don't have any global outcomes imported, you can
   fairly easily mock one out by creating an account level outcome,
   then explicitly setting its context_type and context_id to both be
   nil in the rails console. If you want to import actual AB outcomes,
   follow the steps laid out on the link below
   https://instructure.atlassian.net/wiki/spaces/OUT/pages/92635284/Academic+Benchmark+Importing
 - log in as a teacher
 - as the teacher, you should not be able to move or delete the global outcome
   in the course. The edit button should also not be available.
 - while logged in as admin, behavior should be unchanged from before

Change-Id: I1096330177e6c43ac8c98f510b920d8c2edffca1
Reviewed-on: https://gerrit.instructure.com/125950
Tested-by: Jenkins
R...

Change-Id: Ie38b71b2b4076fbbcca7be024295fd557d37b759

Change-Id: I8661c4b313f3023d80562b3f30bd4199650d5351

Change-Id: I4923fc20eb44e32558b4614d7c10adcb3f76e544

Change-Id: I966a2863afb4e83e41379f9ace46ebaf4c6b0f7f

Change-Id: Ic5713ccb80072d38d7474d4e76e5d0f76ff0e8af

new cache_store.rb happens _after_ switchman's initializer, which
will implicitly run everything through ActiveSupport::Cache.lookup_store,
thinking it was a config (even though it wasn't)

Change-Id: Ie3ced1dce94054a6374450ac0990a89c6432db4c
Reviewed-on: https://gerrit.instructure.com/126034


Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>

fixes CNVS-39296

test plan:
 * run jobs/web (must be using a web server that doesn't capture HUP
   itself)
 * HUP your processes
 * notice that they don't crash, and the logs will say that the reloader
   ran

Change-Id: I150729fdb68c0fd0ff462d794eecfc8da7e17e5e
Reviewed-on: https://gerrit.instructure.com/125968


Reviewed-by: Tyler Pickett <tpickett@instructure.com>
Tested-by: Jenkins
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>

Fixes: CNVS-39229

Test plan:

- As an admin or teacher go to Settings > Navigation in
  one of your courses, and hide Discussions, Assignments,
  Announcements, and Files from your course navigation

- Go to the dashboard and view the dashcards. You should
  see that the course you updated has no action links
  on its dashcard footer.

- Confirm that this dashcard is the same height as a
  dashcard with links:
  https://www.screencast.com/t/b10oOCVi

Change-Id: Ifa4873de20b79030bc77f85816f8f32e43e7771e
Reviewed-on: https://gerrit.instructure.com/125786


Tested-by: Jenkins
Reviewed-by: Stephen Jensen <sejensen@instructure.com>
QA-Review: Dan Sasaki <dsasaki@instructure.com>
Product-Review: Chris Hart <chart@instructure.com>

fixes CNVS-39235

also allow chaining of clusters (to share a cache store among
multiple clusters), and hot-reloading. but do it all carefully so that
if config doesn't change, we don't reconnect, and shared cache stores
are actually shared (not multiple connections)

Change-Id: I2b72472b4d0f4a34619878752801dd5c05a305a8
Reviewed-on: https://gerrit.instructure.com/125833


Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>

Change-Id: Ibcc7af919cc86a5f7f1ecb9369c62ad6198909ba
Reviewed-on: https://gerrit.instructure.com/125907


Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>

Change-Id: Ib579c9ff6e5f1ad8f57bf5c6cb05c90b77adb04b
Reviewed-on: https://gerrit.instructure.com/125895


Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>

fixes CNVS-39262

test plan
 - disable throttling
 - it should still return X-Rate-Limit-Remaining

Change-Id: Id6e0110d641d214797ac5657beccc91920207a58
Reviewed-on: https://gerrit.instructure.com/125863


Reviewed-by: Simon Williams <simon@instructure.com>
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>

This reverts commit bec16126.

Change-Id: I072a69f0742b29a39930b16e782c1a314b0a3e8e
Reviewed-on: https://gerrit.instructure.com/125837


Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>

fixes CNVS-39233

for MultiCache usage, fixes race conditions around thundering herds

Change-Id: I0aff8fb32b3fe8420282aa4a6f32b9f696f637a9
Reviewed-on: https://gerrit.instructure.com/125617


Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>

fix :allthethings:

Change-Id: I687529a965316c17d0c5c3e6d02282511a016801
Reviewed-on: https://gerrit.instructure.com/125849


Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>

Conflicts:
	spec/lib/inst_fs_spec.rb

closes CNVS-39230

Change-Id: Iabe72578d52079628a18d2212b40a8a85e273b26
Reviewed-on: https://gerrit.instructure.com/125589


Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>

just pretend it's empty. the caller should be responsible for dealing
with missing consul data as appropriate

Change-Id: I2c37d33481b55776b14c6c17e109005a75dd600b
Reviewed-on: https://gerrit.instructure.com/125567


Reviewed-by: Tyler Pickett <tpickett@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>

closes CNVS-35834

 * allow specifying tree, service, and cluster for consul stuff
 * check multiple consul keys for each setting (cluster, env, region, global)

test plan:
 * an existing consul environment still works

Change-Id: I48e8fadeac2e140973bfc4b41c1cfb386532d15c
Reviewed-on: https://gerrit.instructure.com/125271


Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>

Conflicts:
	spec/lib/inst_fs_spec.rb

closes CNVS-39324

Change-Id: I6c9fccaddd3661e3fdc350e94ae9e58854a544ad
Reviewed-on: https://gerrit.instructure.com/125792


Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>

Change-Id: I80c455f16f0331fea922b39484bf2a88ca920d8e
Reviewed-on: https://gerrit.instructure.com/125766


Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Tested-by: Jenkins
Product-Review: Cody Cutrer <cody@instructure.com>

test plan:
* have mastery paths enabled in a course with some modules
* in the course settings, set "visibility" to "public"
* try to visit the course modules page in a new browser
 as an unauthenticated user
* it should not lead to a page error

closes #OUT-994

Change-Id: Iae58a3927ad7a404da799bb216e73e63ac74973f
Reviewed-on: https://gerrit.instructure.com/125337


Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Leo Abner <rabner@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>

Change-Id: Ifcacb52d45e15ce19aa4f5c56ba1b929d3158892
Reviewed-on: https://gerrit.instructure.com/125746


Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Reviewed-by: Tyler Pickett <tpickett@instructure.com>
Product-Review: Tyler Pickett <tpickett@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>

Change-Id: Iffa1575060b304cf95731241e0c61d50f1c2ad53

Change-Id: I73150327d1be5a79982acf59248d503d464364f9

closes GRADE-264

Test Plan 1: attachment_id is nil
1. Create a 'file upload' assignment.
2. Submit as a student and attach a file.
3. Go into a rails console and adjust the attachment_association so that
   it no longer points to the attachment:

   assignment = Assignment.find(<assignment-id>)
   submission = assignment.submissions.find_by(user_id: <student-id>)
   association = submission.attachment_associations.first
   association.update!(attachment_id: nil)

4. Open the assignment in SpeedGrader and verify there is not a 500
   thrown.

Test Plan 2: attachment_id points to a deleted attachment
1. Create a 'file upload' assignment.
2. Submit as a student and attach a file.
3. Go into a rails console and permanently destroy the attachment:

   assignment = Assignment.find(<assignment-id>)
   submission = assignment.submissions.find_by(user_id: <student-id>)
   attachment = submission.attachments.first
   attachment.destroy_permanently!

4. Open the assignment in SpeedGrader and verify there is not a 500
   thrown.
Change-Id: I61b867ef74ae49e2173068e237bfd8c0c75a9348
Reviewed-on: https://gerrit.instructure.com/125450


Reviewed-by: Derek Bender <djbender@instructure.com>
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Tested-by: Jenkins
QA-Review: Anju Reddy <areddy@instructure.com>
Product-Review: Pert Eilers <peilers@instructure.com>

fixes CNVS-39168

test plan
 - run import without integration_id
 - it should not reset it

Change-Id: I7d48a2111a461635eb71d142bdc39f03fa2bdd6b
Reviewed-on: https://gerrit.instructure.com/125460


Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>

Change-Id: If408e65bf314c8a8ed35a04ad8e6752b0d553240

Change-Id: I179420223cb92ca64de59a10917bebe7993b3902

Change-Id: Iee64adfe182410a48b619d3fe312d1b6029359f3

Change-Id: I45993f498000a567e3f2e44254a78600188c0d91