diff options
| author | Phil Hughes <me@iamphill.com> | 2018-05-08 09:06:48 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-05-08 09:06:48 +0000 |
| commit | fcea5fc8f902c6e8c8f4643abd9ed91c67e22228 (patch) | |
| tree | 4e4c35d8495369107d92e6fbbaa45bd1c6c0754a | |
| parent | a9ff1792ba020963c8985b61b07436948ef682c8 (diff) | |
| parent | 54a0146d2a157eb0dccfe8154dc487718449d4ec (diff) | |
| download | gitlab-ce-fcea5fc8f902c6e8c8f4643abd9ed91c67e22228.tar.gz | |
Merge branch '46136-fix-dependencies' into 'master'
Resolve "Add sha1 dependency EE backport"
Closes #46136
See merge request gitlab-org/gitlab-ce!18804
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | yarn.lock | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/package.json b/package.json index 4a1a594454c..9543dba1bbc 100644 --- a/package.json +++ b/package.json @@ -71,6 +71,7 @@ "raw-loader": "^0.5.1", "sanitize-html": "^1.16.1", "select2": "3.5.2-browserify", + "sha1": "^1.1.1", "sql.js": "^0.4.0", "style-loader": "^0.21.0", "svg4everybody": "2.1.9", diff --git a/yarn.lock b/yarn.lock index 2d18a694e9d..d3d04fa0d47 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1586,6 +1586,10 @@ chardet@^0.4.0: version "0.4.2" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" +"charenc@>= 0.0.1": + version "0.0.2" + resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" + chart.js@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-1.0.2.tgz#ad57d2229cfd8ccf5955147e8121b4911e69dfe7" @@ -2086,6 +2090,10 @@ cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" +"crypt@>= 0.0.1": + version "0.0.2" + resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b" + cryptiles@2.x.x: version "2.0.5" resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" @@ -7859,6 +7867,13 @@ sha.js@^2.4.0, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" +sha1@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/sha1/-/sha1-1.1.1.tgz#addaa7a93168f393f19eb2b15091618e2700f848" + dependencies: + charenc ">= 0.0.1" + crypt ">= 0.0.1" + shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" |