summaryrefslogtreecommitdiff
path: root/yarn.lock
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-11-30 09:52:58 +0000
committerPhil Hughes <me@iamphill.com>2017-11-30 09:52:58 +0000
commit386cbf22ee8fc1d206e76f0f34568379ae726e02 (patch)
tree4976d52023637beaa5046035b64554dd451f0d27 /yarn.lock
parent1880809d8ef9b650d1af615ebbaa590626ccf17f (diff)
parent73e48b745c34c048c56abf28e6c278707d9bd2f3 (diff)
downloadgitlab-ce-386cbf22ee8fc1d206e76f0f34568379ae726e02.tar.gz
Merge branch 'master' into multi-file-editor-dirty-diff-indicator
Diffstat (limited to 'yarn.lock')
-rw-r--r--yarn.lock18
1 files changed, 9 insertions, 9 deletions
diff --git a/yarn.lock b/yarn.lock
index f631c0167e6..88897476a15 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1297,13 +1297,13 @@ cli-width@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a"
-clipboard@^1.5.5:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-1.6.1.tgz#65c5b654812466b0faab82dc6ba0f1d2f8e4be53"
+clipboard@^1.5.5, clipboard@^1.7.1:
+ version "1.7.1"
+ resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-1.7.1.tgz#360d6d6946e99a7a1fef395e42ba92b5e9b5a16b"
dependencies:
- good-listener "^1.2.0"
+ good-listener "^1.2.2"
select "^1.1.2"
- tiny-emitter "^1.0.0"
+ tiny-emitter "^2.0.0"
cliui@^2.1.0:
version "2.1.0"
@@ -2900,7 +2900,7 @@ globby@^6.1.0:
pify "^2.0.0"
pinkie-promise "^2.0.0"
-good-listener@^1.2.0:
+good-listener@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
dependencies:
@@ -6138,9 +6138,9 @@ timers-browserify@^2.0.2:
dependencies:
setimmediate "^1.0.4"
-tiny-emitter@^1.0.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-1.1.0.tgz#ab405a21ffed814a76c19739648093d70654fecb"
+tiny-emitter@^2.0.0:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.0.2.tgz#82d27468aca5ade8e5fd1e6d22b57dd43ebdfb7c"
tmp@0.0.31, tmp@0.0.x:
version "0.0.31"