Skip to content

Commit

Permalink
Point to instructure forks
Browse files Browse the repository at this point in the history
Closes: CCI-351

flag = none

Test Plan:
- no behavioral changes
- build passes

Change-Id: I2e6bfa46b56ee2b59b8289fc90ef9c319757fc34
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/235566
Tested-by: Service Cloud Jenkins <[email protected]>
Reviewed-by: James Butters <[email protected]>
Reviewed-by: Jacob Powell <[email protected]>
QA-Review: James Butters <[email protected]>
QA-Review: Jacob Powell <[email protected]>
Product-Review: James Butters <[email protected]>
  • Loading branch information
djbender committed Apr 30, 2020
1 parent 3d9bffd commit 1a5bb0a
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion gems/canvas_i18nliner/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"ember-template-compiler": "1.8.0",
"glob": "^7.0.3",
"handlebars": "1.3.0",
"i18nliner": "ryankshaw/i18nliner-js#babel7",
"i18nliner": "instructure/i18nliner-js#babel7",
"i18nliner-handlebars": "^0.2.2",
"minimist": "^1.1.0",
"mkdirp": "^0.5.1"
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
"immutability-helper": "^3",
"immutable": "^3.8.2",
"is-valid-domain": "^0.0.11",
"jquery": "https://github.com/ryankshaw/jquery.git#1.7.2-with-AMD-and-CommonJS",
"jquery": "https://github.com/instructure/jquery.git#1.7.2-with-AMD-and-CommonJS",
"jquery-getscrollbarwidth": "^1.0.0",
"jquery-ui-touch-punch": "^0.2.3",
"jquery.cookie": "^1.4.1",
Expand Down Expand Up @@ -273,7 +273,7 @@
"webpack-manifest-plugin": "^2",
"webpack-stats-plugin": "^0.2.1",
"wsrun": "^5",
"xsslint": "ryankshaw/xsslint#babel7",
"xsslint": "instructure/xsslint#babel7",
"yaml-loader": "^0.5"
},
"optionalDependencies": {
Expand Down Expand Up @@ -327,9 +327,9 @@
"upgrade-instructure-ui": "script/upgrade-instructure-ui"
},
"resolutions": {
"jquery": "https://github.com/ryankshaw/jquery.git#1.7.2-with-AMD-and-CommonJS",
"jquery": "https://github.com/instructure/jquery.git#1.7.2-with-AMD-and-CommonJS",
"graphael": "this is just here so yarn.lock looks the same whether the analytics plugin is checked out or not",
"graphael": "https://github.com/ryankshaw/graphael.git",
"graphael": "https://github.com/instructure/graphael.git",
"node-sass": "if we let node-sass upgrade to recent versions, it causes: SIS-3125",
"node-sass": "4.7.2"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/canvas-rce/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"i18n-js": "^3",
"i18nliner": "~0.2.0",
"isomorphic-fetch": "2.2.1",
"jquery": "https://github.com/ryankshaw/jquery.git#1.7.2-with-AMD-and-CommonJS",
"jquery": "https://github.com/instructure/jquery.git#1.7.2-with-AMD-and-CommonJS",
"lodash": "^4",
"minimatch": "~3.0.4",
"prop-types": "^15",
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10598,9 +10598,9 @@ graceful-fs@~2.0.3:
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-2.0.3.tgz#7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"
integrity sha1-fNLNsiiko/Nule+mzBQt59GhNtA=

"graphael@https://github.com/ryankshaw/graphael.git":
"graphael@https://github.com/instructure/graphael.git":
version "1.2.0"
resolved "https://github.com/ryankshaw/graphael.git#067542642fa240925e4e3dd13153333ae1d3ad60"
resolved "https://github.com/instructure/graphael.git#067542642fa240925e4e3dd13153333ae1d3ad60"
dependencies:
raphael "^2.1.4"

Expand Down Expand Up @@ -11530,9 +11530,9 @@ i18nliner-handlebars@^0.2.2:
dependencies:
jsdom "~8.5.0"

i18nliner@ryankshaw/i18nliner-js#babel7, i18nliner@~0.2.0:
i18nliner@instructure/i18nliner-js#babel7, i18nliner@~0.2.0:
version "0.2.6"
resolved "https://codeload.github.com/ryankshaw/i18nliner-js/tar.gz/089da4716c98dc536a8c4f79f187b37697591a03"
resolved "https://codeload.github.com/instructure/i18nliner-js/tar.gz/089da4716c98dc536a8c4f79f187b37697591a03"
dependencies:
"@babel/parser" "^7"
"@babel/traverse" "^7"
Expand Down Expand Up @@ -13134,9 +13134,9 @@ [email protected]:
dependencies:
jquery ">=1.5"

[email protected], jquery@>=1.2.6, jquery@>=1.5, jquery@>=1.7.1, "jquery@https://github.com/ryankshaw/jquery.git#1.7.2-with-AMD-and-CommonJS":
[email protected], jquery@>=1.2.6, jquery@>=1.5, jquery@>=1.7.1, "jquery@https://github.com/instructure/jquery.git#1.7.2-with-AMD-and-CommonJS":
version "1.7.2"
resolved "https://github.com/ryankshaw/jquery.git#3a48a84c713291b790a2556d9ba036ec4d53c52f"
resolved "https://github.com/instructure/jquery.git#3a48a84c713291b790a2556d9ba036ec4d53c52f"

js-base64@^2.1.8, js-base64@^2.1.9:
version "2.5.1"
Expand Down Expand Up @@ -21917,9 +21917,9 @@ xmlhttprequest-ssl@~1.5.4:
resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=

xsslint@ryankshaw/xsslint#babel7:
xsslint@instructure/xsslint#babel7:
version "0.1.5"
resolved "https://codeload.github.com/ryankshaw/xsslint/tar.gz/2ef5f95c4eec8494b213d6c25f92615edd26ca50"
resolved "https://codeload.github.com/instructure/xsslint/tar.gz/2ef5f95c4eec8494b213d6c25f92615edd26ca50"
dependencies:
"@babel/parser" "^7"
"@babel/traverse" "^7"
Expand Down

0 comments on commit 1a5bb0a

Please sign in to comment.