fixes CNVS-39788

test plan
 - should have multi_term_batch_mode in response

Change-Id: Idb0ada9eff15c62848d7b616e95a8b01d4870cca
Reviewed-on: https://gerrit.instructure.com/128521


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

Change-Id: I89b1a4070275a1ed84c0cbb649b74657c8af62fb

Change-Id: Ib64a139e3828043fa805b9340fe20b1530371c8d

Change-Id: I34d1ebdd0bb5ffd13faedfbf9cc113b681831359

Change-Id: I23c63e7aa25ea1b06e9c8bc91a363dd277a182aa

Change-Id: Ib6e11ccd0563d6c250c726fd6d8c99b45389d93d

Change-Id: I11204bb2b18916619fc9093362c5ecd16ef4da9a

Change-Id: Ib8390d02f79849d29666a1db9f182302026e9267

Change-Id: Ic34f68145efd2f341fd94503f3e1d32d35a18d1f

Change-Id: I6a2e9ff071d8792aafc978b7b26d778655494510

Change-Id: I7f83eb7383f7a82846db12c57610d7d8beef0fc2

Change-Id: Id54e2ff49736bbb2f9443be9d94bab3bc93ddc8a

Change-Id: I2c4fed07d0e059a9439d0ccd0c3760764feec51e

Change-Id: I1a945cbaebab6818d75e6ba1de30559b4ddf5a6f

Change-Id: Idb1f2db0ba79ae67fed199afef729920a8a28d88

Change-Id: I30b67017da51eb4ef76e286e7aaa648a3c657020

Change-Id: Id44c6feff11968020362a826b5c2e0fe269b2a06

Change-Id: I7087063837c9b202166afa274188c93ee62bf37a

Change-Id: If3c3a319033c3e402ccf1f06c451d6e4986bd46b

Change-Id: I86c6f23d9db2ec7fa208f22ca4ae9cde588f75c8

Change-Id: I1d199a74af24b3e0b6af2c3399ec557f81960d87

Change-Id: I6bdec83ab7afafad33bcbe2e055a5d6c60775779

Change-Id: I9c7e6c4d6ea9331823a3df6438c8bc754d289791

Change-Id: I4b659cdca46f6ff1d6fc8e489b59d710dc1f9939

fixes CNVS-39626

test plan
 - have 2 enrollments in different sections same
   user and same course
 - conclude one of the enrollments
 - hit submission api for concluded enrollment
   section with enrollment state concluded
 - it should only have concluded enrollment 

Change-Id: I321b876351b54df9e517d4c736e7d5fe4f234a3f
Reviewed-on: https://gerrit.instructure.com/127795


Tested-by: Jenkins
Reviewed-by: James Williams <jamesw@instructure.com>
QA-Review: Tucker McKnight <tmcknight@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>

fixes CNVS-39621

test plan
 - run multi_term_batch_mode sis imports
 - it should remove excluded items from all
   included terms
 - run rake doc:api
 - api docs and sis_csv doc should generate and be
   clear

Change-Id: I315b8bf4a78422a8b9f96cf330da6aa1553cacb8
Reviewed-on: https://gerrit.instructure.com/127686


Tested-by: Jenkins
Reviewed-by: Tyler Pickett <tpickett@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>

This patchset cleans up a few N+1s related to grading periods and
scores when the courses API is called for a student with
include=current_grading_period_scores and include=total_scores

fixes GRADE-300

test plan:
 - Have a few courses in an enrollment term with multiple grading
   periods set up.
 - Have a few courses in an enrollment term without MGP set up.
 - Register a student in those courses
 - As the student hit the courses API endpoint as:
   /api/v1/courses?include%5B%5D=needs_grading_count&include%5B%5D=syllabus_body&include%5B%5D=total_scores&include%5B%5D=term&include%5B%5D=permissions&include%5B%5D=current_grading_period_scores&include%5B%5D=favorites&include%5B%5D=tabs&per_page=99
 - Observe in the logs that grading period information and score
   information is only loaded once and not once per course

Change-Id: I5c2caf23bb7f51274a0a482ac8b4f3135e887cd6
Reviewed-on: https://gerrit.instructure.com/127447


Reviewed-by: Shahbaz Javeed <sjaveed@instructure.com>
Tested-by: Jenkins
Reviewed-by: Jeremy Neander <jneander@instructure.com>
QA-Review: Derek Bender <djbender@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>

Closes PLAT-2818

Test Plan:
- Using the Create endpoint API found at
  https://canvas.instructure.com/doc/api/originality_reports.html
  and specify an originality score.
- Verify the originality report is created with the specified
  originality score and other data.
- Repeat the exact same post request, but change the originality
  score value.
- Verify the originality report is updated and a new one is not
  created.
- Verify you can still update the originality report via the
  PUT endpoint found in the same docs.

Change-Id: I4a2b8ad6f5b68e49a6195862cf7826fe31152bca
Reviewed-on: https://gerrit.instructure.com/125944


Tested-by: Jenkins
Reviewed-by: Andrew Butterfield <abutterfield@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Weston Dransfield <wdransfield@instructure.com>

closes: GRADE-299

test plan:
- using the quiz submissions api, pass the following params:
  - include[]=submission
  - include[]=mobile_teacher_state
  - include[]=mobile_student_label
- the api should respond with submission objects that include both
  mobile_teacher_state and mobile_student_label

Change-Id: Ifd93cb84eee2ce142f17419eb06f4011026a22b7
Reviewed-on: https://gerrit.instructure.com/127416


Tested-by: Jenkins
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
QA-Review: Taylor Wilson <twilson@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>

fixes CNVS-39608

test plan
 - use change_threshold in sis import api
 - it should work

Change-Id: Ice7625f4525753547d2b67cca99c0f02527c15eb
Reviewed-on: https://gerrit.instructure.com/127585


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

Fixes: PFS-8712

Test Plan:
In environment with page caching -
1.  View rubric page (account or course
    shouldn't matter)
2.  Turn on "rubric criterion range" in
    account features.
3.  Wait 5 minutes and View rubric page
    - range option should be available.
4.  Turn off "rubric criterion range".
5.  Wait 5 minutes and Reload rubric page
    - range option should not be available.

To enable caching on a local dev environment:
In config/environments/development.rb:

1) config.cache_classes = true

2) config.action_controller.perform_caching = true

Change-Id: I43114086c1df903cc4ee103c0e63ce4f0018d8e5
Reviewed-on: https://gerrit.instructure.com/127456


Tested-by: Jenkins
Reviewed-by: Matt Berns <mberns@instructure.com>
QA-Review: Aiona Hernandez <ahernandez@instructure.com>
QA-Review: Andrew Porter <hporter-c@instructure.com>
Product-Review: Sidharth Oberoi <soberoi@instructure.com>

Change-Id: I5268d3dc937fe65ccfbe535ef0d74c7da9cc8b55

and patch some other `render :text`s

test plan:
* check the "allow students to download course content"
 setting on the account level
* on the modules page of a course, click on
 "export course content"
* should not get an error

closes #CNVS-39505

Change-Id: I06e210b84f44756d85131853daff5d4a682e5fea
Reviewed-on: https://gerrit.instructure.com/127347


Tested-by: Jenkins
Reviewed-by: Dan Minkevitch <dan@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>

Fixes: CNVS-38996

If this style rule is included, the entire page
Crashes in Edge 15. Not a server error, not a JS
error, Edge itself crashes.

UI-Devs: if you still want to have this different
box-shadow in High Contrast mode, you could maybe
toy with why it caused the page to crash or do it in a way
That it doesn’t apply to Edge 15. But deleting it was
The easiest way I found to fix the problem

Test plan:
* in edge 15 (you can go to modern.ie and launch a live edge 15 from 
  your normal browser for free)
* log in and set your user settings to use high contrast
* go to any page
* edge should not crash and the page should display correctly

Change-Id: I2df0da7e328f5200a9fe1fa9235d28bbb561a10a
Reviewed-on: https://gerrit.instructure.com/127216


Tested-by: Jenkins
Reviewed-by: brian kirkby <bkirkby@instructure.com>
Reviewed-by: Chris Hart <chart@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>

With chrome 61, jquery's $.windowScrollTop() returns 0.  This fixes it.

fixes OUT-1525

Test plan
  - create an assignment in a course and add a rubric
  - make the browser window small enough that you can scroll down
    vertically
  - wait a few seconds
  > expect the window to stay still

Be sure to test in chrome 61 and a few other browsers.

Change-Id: Ie8992eb1f46207a0a3a94f7c48fcc8c4f34b3cba
Reviewed-on: https://gerrit.instructure.com/126604


Tested-by: Jenkins
Reviewed-by: Felix Milea-Ciobanu <fmileaciobanu@instructure.com>
QA-Review: Anju Reddy <areddy@instructure.com>
Product-Review: Ed Schiebel <eschiebel@instructure.com>

refs CNVS-39528

Change-Id: Ib6025b893e31922724ef84de781ed98238d5d1b3
Reviewed-on: https://gerrit.instructure.com/127239


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

Fixes: CNVS-39490

test plan:
- this is a global app-wide change where "every" publish icon
  should now be mapped to the "solid" version
- ensure when a course is published that the icon is solid
  (this also shows on the course settings view)
- ensure when an assignment is published the icon is solid
- ensure when a quiz is published the icon is solid
- ensure when a page is published the icon is solid
- ensure the toggling of unpublished/published works as usual
- navigate around canvas to ensure all "publish" icons
  show as solid
- example view: https://screencast.com/t/c0igjpnOX33

Change-Id: I101fab36d1c13bc37cd7282a36c39184b5ec4500
Reviewed-on: https://gerrit.instructure.com/127031


Tested-by: Jenkins
Reviewed-by: Stephen Jensen <sejensen@instructure.com>
QA-Review: Dan Sasaki <dsasaki@instructure.com>
Product-Review: Kyle Follett <kfollett@instructure.com>

Fixes: CNVS-39293

Since we eliminated the pre-population functionality from our Consul
wrapper we needed something to conveniently populate the KV store.

Test Plan:
- Start a Consul server
- Run `bin/rake canvas:seed_consul`
- Verify that values were written to the KV store.

Change-Id: I340011b7d00ed4e3dd2918e3f101f6377fc72d7e
Reviewed-on: https://gerrit.instructure.com/126574


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

fixes CNVS-39004

this was allowed before, but was disallowed because it broke I18n
(see CNVS-37038). we will use the same technique we used with
the menu name in CNVS-38421 to allow link text and subtext to be
customized, or localized if it isn't customized; namely, we will
not store the saved value if it matches the default value from
the code in the locale of the user saving it.

test plan:
 0. enable help links by doing the following in a Rails console:

    Setting.set("show_feedback_link", "true")

 1. still in the Rails console, clear existing custom link
    definitions, if present, as follows:

    a = Account.default
    a.settings.delete(:custom_help_links)
    a.save!

 2. start your server with RAILS_LOAD_ALL_LOCALES=1

 3. go to /accounts/1/settings and edit the text of one of
    the default help links (note the URL is still immutable).
    Save account settings.

 4. change your language to Spanish.

 5. go back to /accounts/1/settings, and the link text you
    edited should be what you set it to. the other links
    should be displayed in Spanish.

 6. edit another link and save.

 7. switch back to English. the two links you edited should
    remain edited; the others should now show in English.

Change-Id: I44bd407c57f88166562b7e0745560133e78ad4ea
Reviewed-on: https://gerrit.instructure.com/126948


Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins
QA-Review: Heath Hales <hhales@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>

fixes CNVS-39322

test plan
 - counts should have user_observers and change_sis_ids

Change-Id: I861595cd6312eb6f7a68ec9fbe43c8cf39680e39
Reviewed-on: https://gerrit.instructure.com/126855


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