diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2017-02-17 17:01:05 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2017-02-17 17:01:05 +0000 |
commit | 74f211f076f8f5f088634dac72f2056b32a0a671 (patch) | |
tree | 9f26535ad6d9f8ba0523f80960e75b4994b4eacd | |
parent | 7627af225e22e534b34899e05258c1ff0d8be4af (diff) | |
parent | 62d72434f0429bf1411d05369bd0deee942a3d5a (diff) | |
download | gitlab-ce-74f211f076f8f5f088634dac72f2056b32a0a671.tar.gz |
Merge branch '28339-npm-jqueryui-ssh' into 'master'
Use http to fetch jQuery-ui dependency instead of ssh
Closes #28339
See merge request !9331
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | yarn.lock | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package.json b/package.json index 08bde1bc313..22fc4ee5731 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "es6-promise": "^4.0.5", "imports-loader": "^0.6.5", "jquery": "2.2.1", - "jquery-ui": "github:jquery/jquery-ui#1.11.4", + "jquery-ui": "git+https://github.com/jquery/jquery-ui#1.11.4", "jquery-ujs": "1.2.1", "js-cookie": "^2.1.3", "karma-mocha-reporter": "^2.2.2", diff --git a/yarn.lock b/yarn.lock index 99db6f61bcd..3ced18355cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2624,9 +2624,9 @@ jodid25519@^1.0.0: dependencies: jsbn "~0.1.0" -"jquery-ui@github:jquery/jquery-ui#1.11.4": +"jquery-ui@git+https://github.com/jquery/jquery-ui#1.11.4": version "1.11.4" - resolved "https://codeload.github.com/jquery/jquery-ui/tar.gz/d6713024e16de90ea71dc0544ba34e1df01b4d8a" + resolved "git+https://github.com/jquery/jquery-ui#d6713024e16de90ea71dc0544ba34e1df01b4d8a" jquery-ujs@1.2.1: version "1.2.1" |