Commit Graph

41080 Commits

Author SHA1 Message Date
Michael Ziwisky 14682d6b1b tweaks to dynamodb docker-compose setup
- gets rid of container_name, as this explicit name breaks from the
   pattern used in the rest of the codebase.
 - gets rid of env vars for AWS creds as they're unnecessary, and could
   potentially interfere with other aws libs besides dynammodb.
 - removes `links` as its deprecated and redundant with `depends_on`
 - adds "VIRTUAL_{HOST,PORT}" for dinghy

also fixes a typo in an old data fixup

Change-Id: Ie5953d1ee89d9e40779fe8f3e6c56731f77684d2
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/246061
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
QA-Review: Ethan Vizitei <evizitei@instructure.com>
Product-Review: Ethan Vizitei <evizitei@instructure.com>
2020-08-26 16:39:21 +00:00
Aaron Ogata 6615c4cd7e skip flakey spec
refs LS-1394

Change-Id: Iacb08ad926a583c78472efb9f0127f1b10249b3f
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/246074
Reviewed-by: Ryan Norton <rnorton@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Aaron Ogata <aogata@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>
2020-08-26 16:34:36 +00:00
Rob Orton 3cbd2d31b4 use method to find pairing code
test plan
 - specs should pass

refs FOO-894
flag=none

Change-Id: I3b8b94d52a87977502c82d0235ff8644840eca68
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245938
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Ben Nelson <bnelson@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Caleb Guanzon <cguanzon@instructure.com>
2020-08-26 16:31:55 +00:00
Rob Orton 4e6aa43759 use correct id for merging observation links
when merging a user if done from the source shard the target user.id is
global, but from target shard is is local and the update call will fail
and update the record to a local id. This could potentially be a user
that should not be associated to that record

test plan
 - specs should pass
 - merge users with observation links from target shard

fixes VICE-734
flag=none

Change-Id: Iad6007bfb4bc596f21a69a59555d5622f08d4721
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245751
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Ben Nelson <bnelson@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Caleb Guanzon <cguanzon@instructure.com>
2020-08-26 16:31:39 +00:00
Ahmad Amireh 9bb6ac03dd add phrases for the catalan (CA) locale
refs FOO-519
flag = none

|
| TEST PLAN
| ---- ----

none, the actual support for the language will come in a different patch

Change-Id: Icb3383d83447f13fd579bc5011f38fafa5513e7a
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245531
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: August Thornton <august@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: August Thornton <august@instructure.com>
2020-08-26 13:13:46 +00:00
Jenkins ecee13ee49 [i18n] Update package translations
Change-Id: Iaf5185fa6dc484358f05bbc31c7fe151bc366417
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/246058
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2020-08-26 04:55:16 +00:00
Rob Orton 238bd5992c pass enrollment_info for better errors
right now it fails cause MRA is not creating proper errors for bulk
insert. This allows the errors to stay consistent and still function
for finding the root_account

test plan
 - run import with invalid root_account_id
 - it should not fail import but should have a valid error
 - it should skip line

fixes VICE-686
flag=none

Change-Id: I5b17507045dfe23666f6dd29f347d61b102bc5e0
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/244313
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Caleb Guanzon <cguanzon@instructure.com>
2020-08-26 00:03:12 +00:00
Augusto Callejas dcf2e37129 Query node support for proficiencies/calc. methods
refs OUT-3836

flag=account_level_mastery_scales

Add top-level query node support for outcome proficiencies
and outcome calculation methods. See "Node interface" in
"app/graphql/types/HOWTO Add Types.md" for more details.

test plan:
  - create outcome proficiency and outcome calculation method
    on an account
  - query proficiency to get relay-style id:
    query MyQuery {
      outcomeProficiency(id: "<id>") {
        id
      }
    }
  - query via node and confirm the legacy id comes back:
    query MyQuery {
      node(id: "<relay-style-id>") {
        ... on OutcomeProficiency {
          _id
        }
      }
    }
  - query calculation method to get relay-style id:
    query MyQuery {
      outcomeCalculationMethod(id: "<id>") {
        id
      }
    }
  - query via node and confirm the legacy id comes back:
    query MyQuery {
      node(id: "<relay-style-id>") {
        ... on OutcomeCalculationMethod {
          _id
        }
      }
    }

Change-Id: Ibf8ebf4e2e7001481ff6450158e02b43747ba5c4
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245156
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Pat Renner <prenner@instructure.com>
Product-Review: Augusto Callejas <acallejas@instructure.com>
Reviewed-by: Evan Francis <efrancis@instructure.com>
Reviewed-by: Pat Renner <prenner@instructure.com>
2020-08-25 23:59:18 +00:00
Ed Schiebel d3cd1d7fc1 Fix fullscreen videos in safari
While fixing this I stumbled on the fact that fullscreen in the
video upload modal wasn't sizing the player correctly, so that's
fixed too.

closes LS-1348
flag=rce_enhncements

test plan:
  - in safari, open any page with a video added via the new rce
  > expect the fullscreen button to be available
  - click it
  > expect the video to go fullscreen and resize to fill the screen
    (if the video is portrait, or short-and-squat, expect it to be
    letterboxed)
  - click the exit fullscreen button or click esc
  > expect it to return to its original size

  - in any browser, including safari:
  - open an edit page with the RCE
  - open Upload/Record Media dialog
  - select a video
  - click the fullscreen button in the preview
  > expect it to size the player to fill the screen (letterboxed
    if necessary)
  - click exit fullscreen (or click esc)
  > expect to return to its original size

Change-Id: I3a4080f06cb132902bde98d2dfd86170a2a394cb
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245846
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Alex Anderson <raanderson@instructure.com>
QA-Review: Robin Kuss <rkuss@instructure.com>
Product-Review: Ed Schiebel <eschiebel@instructure.com>
2020-08-25 21:59:14 +00:00
Ed Schiebel 5374ad43ef Don't delete links containing just images and no text
LS-1146 added code to delete empty links from the RCE. Unfortunately, it
didn't take into account links with no text content, like a linked
image. This fixes that.

closes LS-1350
flag=rce_enhancements

test plan:
  - Create a Page - upload and embed an image on the page
  - Using the hyperlink tool, link the image to either an
    external link or a course link
  - click the image and click 'link options'
  - Change the target url (or don't)
  - Click Done
  > expect the link to be updated and not deleted.

  - create another link with just text
  - delete the text
  > expect the link to be deleted from the DOM in this case

Change-Id: I8c95364a48fba95abdc2525ede600c5a11e278f8
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245980
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Alex Anderson <raanderson@instructure.com>
QA-Review: Robin Kuss <rkuss@instructure.com>
Product-Review: Ed Schiebel <eschiebel@instructure.com>
2020-08-25 21:58:55 +00:00
Davis Hyer 062555c451 filter profane slugs
fixes VICE-739
flag=none

See https://instructure.slack.com/archives/CGC0YJJDS/p1598370828002100
for context. tl;dr random strings can sometimes result
in vulgarity. This commit has us pick a new random
string if the previous was deemed vulgar

test plan:
  - :noideadog:

qa risk: low

Change-Id: Iddd4d0c944c44f85af9cf32352611acafd44f734
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/246010
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Tested-by: Jeffrey Johnson <jeffrey.johnson@instructure.com>
Reviewed-by: Jeffrey Johnson <jeffrey.johnson@instructure.com>
QA-Review: Jeffrey Johnson <jeffrey.johnson@instructure.com>
Product-Review: Jeffrey Johnson <jeffrey.johnson@instructure.com>
2020-08-25 21:09:54 +00:00
Gary Mei 3c8363b6ff fix spacing of flyout button in gradebook
When a column is too small, contents in a cell can be hidden from the
user's eye. This helps in the scenarios where an assignment's grades
are displayed as percentages by removing an empty html element.

fixes EVAL-677
flag=none

Test Plan
- Create an assignment that displays as percentage.
- On master, note how small a column can be before the flyout button for
the Submission Tray is starting to become hidden out of view.
- With this commit, verify that at the same size, the flyout button is
more visible.

Change-Id: I74e600a9ae7019778b0b0bc8037cddff62601d64
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245600
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Product-Review: Jody Sailor
Reviewed-by: Adrian Packel <apackel@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
QA-Review: Gary Mei <gmei@instructure.com>
2020-08-25 18:01:28 +00:00
Charley Kline 0ea99751b3 Don't return stale data after updating permissions
Fixes FOO-661
Refs FOO-873
flag=none

When updating a permission via the API, even though the change
is properly persisted, the stale (pre-update) value may get
returned in the API response. This is because although the
RoleOverride model clears the caches after a save, the update
of the Redis caches may happen asynchronously and thus may not
be complete by the time the response is built.

The fix is to add a new argument to RoleOverride.permissions_for
which causes it to bypass all the caches and always hit the AR
model itself. Then the role_json method in lib/api/v1 can use
that to force permissions_for to skip any cached entries.

Fixing this plus adding the spinners to the permissions buttons
should make the whole workflow of editing permissions settings
way more clear to the user.

Test plan:
* Play around with the permissions settings page
* Your changes should always be reflected properly after the
  API call completes, and should stay that way

Change-Id: I5b0fc1a242f886a4b2d2940e61d2e6d65c1d43d8
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245905
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: August Thornton <august@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: August Thornton <august@instructure.com>
2020-08-25 17:57:51 +00:00
August Thornton d7b20b04bb start focus point on close X for registration signup dialog
this fix should cover all of our student, parent, teacher
signup dialog forms.

fixes FOO-33
flag = none

test plan:
 - using chrome dev tools and responsive view
 - navigate to /register_from_website
 - click through each dialog form
 - verify focus point is set on the first visible
   navigable item (in this case it's the Close X button)

Change-Id: If04bde10558381c07f6265eab6454ada1649f57e
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245699
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
Product-Review: August Thornton <august@instructure.com>
2020-08-25 16:53:10 +00:00
James Williams b3b5dbd5ab include pending enrollments in current_and_future API scope
test plan:
* have a course set to begin in the future with
 users restricted to participate between course dates
* enroll an observer in the future course
* /api/v1/users/self/enrollments?state[]=current_and_future
 should return the future enrollment

closes #LS-1384

Change-Id: I261f78b4f49efbf406aeb450b55c29b1825b3a99
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245911
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jackson Howe <jackson.howe@instructure.com>
QA-Review: Robin Kuss <rkuss@instructure.com>
Product-Review: James Williams <jamesw@instructure.com>
2020-08-25 16:15:14 +00:00
Aaron Ogata 0a1f6164ca skip another flakey spec
refs LS-1297

Change-Id: I06bbaf2f4d7cd3eee241cb04d57547f42ca167fe
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245977
Reviewed-by: James Butters <jbutters@instructure.com>
QA-Review: James Butters <jbutters@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2020-08-25 15:41:03 +00:00
Matthew Lemon 9ebbb931ac fix create new student from course enrollment
When creating a new student from the course enrollment view clicking the
"Click to add a name" link would fail.

fixes VICE-736
flag=none

/ ---- ---- \
| Test Plan |
\ ---- ---- /

- create a course
- navigate to /courses/<id>/users
- click to add people
- enter a bogus email address, login id, or SIS id and click next
- click the "Click to add a name" link
- It should work

Change-Id: Ib3549943510bf206e525589d6961cfbe8fbc7c7e
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245914
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Caleb Guanzon <cguanzon@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Caleb Guanzon <cguanzon@instructure.com>
2020-08-25 15:20:49 +00:00
Ethan Vizitei 42f635be1d allow passing consistency through batch ops
Change-Id: Ib87a7caf7285f1884ac461cbed348d31c8ecb811
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245939
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Rob Orton <rob@instructure.com>
QA-Review: Ethan Vizitei <evizitei@instructure.com>
Product-Review: Ethan Vizitei <evizitei@instructure.com>
2020-08-25 14:55:34 +00:00
Ahmad Amireh 1416ce1abe target partition table for message delivery
fixes FOO-891
flag  = none

0o test plan o.O

- send a message to a user and verify it works
- look at the job runner output and verify the UPDATE queries are
  targeting "messages_2020_35" etc and not "messages"
- you can try this in the console using Message.last.{recycle,deliver}

Change-Id: I5e4ffaf1680ccc40fef9c4c2f19683d29a5e21c0
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245877
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
Tested-by: Cody Cutrer <cody@instructure.com>
2020-08-25 13:09:56 +00:00
Alex Anderson f947195966 Make Link sidebar tray remember selected category
When opening and closing the 'Canvas Links' sidebar tray,
the tray forgets which category is open. This can be
annoying for teachers that want to add a bunch of stuff all
at once, so we persist the open category index to Session
storage.

Test Plan:
Open an RCE editor in a course context.
Make sure the RCS is running
Click the link dropdown and choose 'Course Links'. The tray
should slide out.
Open up one of the categories, like "Quizzes"
Close the tray
Reopen it the same way
The "Quizzes" category should still be open.

flag=rce_enhancements

Fixes LS-1236

Change-Id: Ie8a7c8754ab7096f07617a65af1d9f38ddf89ae2
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245533
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Ed Schiebel <eschiebel@instructure.com>
QA-Review: Robin Kuss <rkuss@instructure.com>
Product-Review: Peyton Craighill <pcraighill@instructure.com>
2020-08-25 10:18:35 +00:00
Jenkins 77af57e981 update tr translation
Change-Id: I487c9db2633ad68efe76fa4b237bc1ac359a8644
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245954
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2020-08-25 06:00:47 +00:00
Jenkins 940327cb84 update fa translation
Change-Id: I600c9851a9076cc2a1b12228e4e023b143374c83
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245953
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2020-08-25 05:58:52 +00:00
Jenkins 7282e913f4 [i18n] Update package translations
Change-Id: Id7182642fea1cfc1c5e24e573128097ba5fad64f
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245951
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2020-08-25 04:54:39 +00:00
Erin Hallmark d326b6f79a Update tooltip for course menu favorite
Users who cannot yet favorite a course get a message saying it
cannot be favorited at this time, but they don't know what that
means. This commit clarifies the tooltip that only active courses
can be added as a favorite.

CLOSES: LS-1373
flag=none

Test plan:
- Tooltip copy is updated
- Jenkins passes

Change-Id: I6d680593e6a5548b09b6261f9e744b9460f2011f
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245662
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Ed Schiebel <eschiebel@instructure.com>
QA-Review: Ed Schiebel <eschiebel@instructure.com>
Product-Review: Erin Hallmark <erin@instructure.com>
2020-08-24 22:15:52 +00:00
Jackson Howe 3d7a41e165 Make beta & masquerading banners responsive
Converts the pink banner that appears in beta/test to use flexbox,
making it responsive down to 320px.

Also sets the width for beta banner and masquerading banner to
100vw, so on pages that overflow horizontally, the banner will stay
in the initial view and match the width of the mobile header.
Ideally, pages will be fixed so they don't overflow horizontally at
all.

Fixes LS-542
flag=none

Test plan:
 - Simulate a test cluster on local
 - Go to Canvas, pink banner should appear
 - Expect banner to look nice on small devices and on desktop
 - Expect banner links and close button to still work
 - Go to a page with horizontal overflow, like /courses/:id/users
 - Expect banner to be fully visible within initial view width
 - Repeat for masquerading banner

Change-Id: Ic383a724ec43885596a1da61ecbfc4ebfcb1637f
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245296
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Ed Schiebel <eschiebel@instructure.com>
QA-Review: Robin Kuss <rkuss@instructure.com>
Product-Review: Jackson Howe <jackson.howe@instructure.com>
2020-08-24 21:29:01 +00:00
Erin Hallmark 32f13a6d4f Update availability date warning message
CLOSES: QO-663
flag=none

Test plan:
- Jenkins passes

Change-Id: Iefc653c428161f674aae311eb3b76ef642e98555
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245660
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Bryan Petty <bpetty@instructure.com>
QA-Review: Erin Hallmark <erin@instructure.com>
Product-Review: Erin Hallmark <erin@instructure.com>
2020-08-24 21:24:32 +00:00
Ethan Vizitei d732b7a180 don't reserve capacity for whitelisted requests
Change-Id: Ic0fabd4f0799afeb3337e439a93c3d31cb0873a4
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245882
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Ethan Vizitei <evizitei@instructure.com>
Product-Review: Ethan Vizitei <evizitei@instructure.com>
2020-08-24 19:07:55 +00:00
Cody Cutrer fc31f434d3 bump switchman
Change-Id: I255311630cfdbd2752bc1a0b44d464054cacfe2c
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245889
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2020-08-24 19:02:09 +00:00
Cody Cutrer fc1ba344be remove unnecessary join in account notifications
Change-Id: Icd7606fb1813855de1b4f646ec711463491ba0db
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245868
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2020-08-24 18:29:46 +00:00
Cody Cutrer 12afbe6447 always return the domain root account from cache no matter how it's queried
Change-Id: I79e7e318b379b99cff62c150b005e2f067bc2a9a
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245859
Reviewed-by: Rob Orton <rob@instructure.com>
Reviewed-by: James Williams <jamesw@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2020-08-24 17:37:47 +00:00
Cody Cutrer 524fa763c6 cache pseudonym credentials for 5s
Change-Id: I105190c171030d01eba6f6b42725836f9a5da185
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245865
Reviewed-by: Keith Garner <kgarner@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2020-08-24 17:37:12 +00:00
Cody Cutrer 18ba95db18 avoid querying all sub accounts for a root account for account notifications
Change-Id: Ic5ef5e38ad0cf265215dbe09559592ab1e8ad63f
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245867
Reviewed-by: Rob Orton <rob@instructure.com>
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
Tested-by: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2020-08-24 16:58:19 +00:00
Adrian Packel 8033220ee9 Fix gradebook grading scheme XSS
flag=none
fixes EVAL-1087

Test plan:
- Have a course with a grading scheme
  - Have an entry in the scheme with a name containing HTML
    - E.g., <b>F</b> or <img src='x' onerror='alert("hi")' />
  - Enable final grade override for the course
  - Have at least one assignment using the grading scheme
- In Gradebook:
  - Assign grades so that a student's total grade corresponds to the
    problematic grading scheme entry
  - Assign an override grade corresponding to the problematic entry
  - Assign a grade for the grading-scheme-based assignment corresponding
    to the problematic entry
  - All of these should escape the value of the grade, and not (say)
    generate Javascript alerts

Change-Id: Ia903646eef218bedb8e032bf3f5168659f5ccde4
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245695
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Gary Mei <gmei@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
Product-Review: Jody Sailor
QA-Review: Adrian Packel <apackel@instructure.com>
2020-08-24 16:48:20 +00:00
James Butters 6cfecfca7f custom checkout with custom canvas_lms_refspec
flag = none

Change-Id: I1b271ef1dcbf5967109def70d8f7fe6e30830b7d
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245598
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Ryan Norton <rnorton@instructure.com>
Reviewed-by: Aaron Ogata <aogata@instructure.com>
QA-Review: James Butters <jbutters@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>
2020-08-24 16:42:44 +00:00
Jackson Howe 1733ccd460 Support group links in RCE
In context of a group instead of a course, the old rce would show
all the group-specific links. The new RCE didn't have this feature
yet and just hid course links in general.

Fixes LS-866
flag = rce_enhancements

Test plan:
 - Create a group within a course and add a student to it
 - Go to the new RCE
 - Expect to find 'group links' in both toolbar and under insert
   menu
 - Click 'group links'
 - Expect tray to properly insert links to group-context pages
 - Click 'Links' select at top of tray
 - Should be able to see files, images, and media at the user
   context
 - Go to RCE in course-context (not in a group), expect everything
   to still work as expected

Change-Id: Iffa58c9648a4632a1991a4627d7d5b1cc72704b4
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245690
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Alex Anderson <raanderson@instructure.com>
QA-Review: Robin Kuss <rkuss@instructure.com>
Product-Review: Jackson Howe <jackson.howe@instructure.com>
2020-08-24 16:29:18 +00:00
Caleb Guanzon 1adf359ad3 spec: remove commented unneeded lines
fixes VICE-528

test plan: none

- these were removed since they cause flakeyness
- the other specs in this file already extensively
    test that the job starts at the notification start time
- they were also removed because they the test's description
    does not need it

Change-Id: Ice756ccfdeb740df5be028be133bfb9df0ebab19
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245849
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Matthew Lemon <mlemon@instructure.com>
QA-Review: Matthew Lemon <mlemon@instructure.com>
Product-Review: Matthew Lemon <mlemon@instructure.com>
2020-08-24 16:21:03 +00:00
Aaron Ogata 4c8cc28a2c skip more flakey specs
refs LS-1297

Change-Id: I63efade8c110237b61dc653b88c00c860e17ff04
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245767
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Ryan Norton <rnorton@instructure.com>
QA-Review: Aaron Ogata <aogata@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>
2020-08-24 15:13:36 +00:00
Caleb Guanzon 62d2ad1988 spec: completes new notifs page specs
flag: notification_update_account_ui

also removes usage of execute_script

test plan: specs pass

Change-Id: I7c97fedf934c3be236c0e48070e1537dfd4c8d28
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245587
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Davis Hyer <dhyer@instructure.com>
QA-Review: Davis Hyer <dhyer@instructure.com>
Product-Review: Davis Hyer <dhyer@instructure.com>
2020-08-24 14:52:19 +00:00
Aaron Ogata e5e6fa54f1 move packages into dependencies layer for caching
refs DE-216

[change-merged]
[build-registry-path=jenkins/canvas-lms/de-216]

Test Plan:
1. Ensure that docker-compose build works locally
2. Ensure that packages building is cached when files aren’t changed
3. Packages build correctly when modified

Change-Id: I3e775e5d7eb51ba06078314b50bf2f8efb6d7d0b
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245423
Reviewed-by: James Butters <jbutters@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Aaron Ogata <aogata@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>
2020-08-24 14:40:21 +00:00
Aaron Ogata 4b796a818e restore junit parallel uploads
refs DE-219

Test Plan:
Run the build several times and ensure the test count is consistent

Change-Id: Id773ef534efa4514543596fdc53bac565a5bd349
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245762
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: James Butters <jbutters@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>
QA-Review: Aaron Ogata <aogata@instructure.com>
2020-08-24 14:37:28 +00:00
Jackson Howe 39f7666226 Remove canvas ENV dependency from canvas-rce
LS-1325 and LS-1219 introduced canvas dependencies into canvas-rce.
This commit passes the ENV.RICH_CONTENT_INST_RECORD_TAB_DISABLED
variable to rce as a prop.

flag=rce_enhancements
fixes LS-1330

Test plan:
 - Open an RCE
 - Media record should be available in toolbar and insert menu
 - In account settings, enable 'disable uploads to canvas media'
 - In RCE, expect to not see media record options in toolbar and
   insert menu

Change-Id: Ib766ceaa7884c2b6464bf6ad071686b1b38d53d2
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245502
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Ed Schiebel <eschiebel@instructure.com>
QA-Review: Robin Kuss <rkuss@instructure.com>
Product-Review: Jackson Howe <jackson.howe@instructure.com>
2020-08-24 14:11:12 +00:00
Service Cloud Jenkins f511dc15d4 Update parallel_runtime_rspec.log from build 85
Change-Id: I3908c59ce380d8799a46425a0d76371253500a91
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245758
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: James Butters <jbutters@instructure.com>
QA-Review: James Butters <jbutters@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>
2020-08-24 13:21:07 +00:00
Jenkins 6538dfbfb9 update tr translation
Change-Id: Ic5e3a7f9ca33d53e5fc8505573bf7fec39696f81
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245774
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2020-08-24 05:57:14 +00:00
Jenkins 92afb4c26a update fa translation
Change-Id: I279191fa4909b5a5b0a0ce455519f37d65a30aee
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245773
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2020-08-24 05:55:36 +00:00
Jenkins a33e863ad0 [i18n] Update package translations
Change-Id: I8b52bd04a04cc01f44659bc9199bcb1fd321e0e2
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245771
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2020-08-24 04:57:38 +00:00
Jenkins 680f065e67 update fa translation
Change-Id: I0eff18706f45789ad06640e9d3d70783397f600d
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245759
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2020-08-23 05:54:48 +00:00
Rob Orton 5ac66f98e5 activate course shard for student_view student
test plan
 - have MRA
 - on course from other domain attempt to create student view student
 - it should work

fixes VICE-733
flag=none

Change-Id: I685a41ea0be38342cd3dfdeac92e4f1267bb64d2
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245750
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2020-08-22 04:58:55 +00:00
Nathan Mills d5f631b9c5 create periodic job to rotate canvas oauth2 keys
fixes SAS-1558

flag = none

test plan:
check that it runs in beta

Change-Id: I36beaae9d417c32d1269c1dd6e039effbed62935
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245702
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Weston Dransfield <wdransfield@instructure.com>
QA-Review: Weston Dransfield <wdransfield@instructure.com>
Product-Review: Nathan Mills <nathanm@instructure.com>
2020-08-21 22:17:27 +00:00
Cody Cutrer 39c3ef1b3c bump saml2
for signature validation fix

Change-Id: I002c6ffe22b4e4affcf7b40ec1953e2393a06849
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245700
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
QA-Review: Ethan Vizitei <evizitei@instructure.com>
Product-Review: Ethan Vizitei <evizitei@instructure.com>
2020-08-21 19:17:40 +00:00
Ed Schiebel 0f4718a6bd Update tinymce language files
Following the instructions in DEVELOPMENT.md, add the updated
tinymce language files. "ca" is a language canvas supports and
is not in tinymce's list, so that's been added.

closes: LS-1349
flag=rce_enhancements

test plan: I have no idea.

Change-Id: Ied91c5ee769878ac0995e7eea99848357feaef12
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/245518
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jackson Howe <jackson.howe@instructure.com>
QA-Review: Robin Kuss <rkuss@instructure.com>
Product-Review: Ed Schiebel <eschiebel@instructure.com>
2020-08-21 18:53:41 +00:00