diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-03-30 06:05:49 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-03-30 06:05:49 +0000 |
| commit | 0ce0732629dba5a830c259d84b864179c430502b (patch) | |
| tree | 6c31a9fd13af8f03fbab0382c42a74744879a5b0 | |
| parent | 9b76d8512a5491202e5a953950cc815be9536648 (diff) | |
| parent | 87ef5e3222553d989758e110eff76733db226cb1 (diff) | |
| download | gitlab-ce-0ce0732629dba5a830c259d84b864179c430502b.tar.gz | |
Merge branch 'revert-7c626d2d' into 'master'
Revert "Merge branch 'sh-add-fsevents-dev-dependency' into 'master'"
See merge request gitlab-org/gitlab-ce!18096
| -rw-r--r-- | package.json | 3 | ||||
| -rw-r--r-- | yarn.lock | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/package.json b/package.json index 31edc3a8016..56fd2575e91 100644 --- a/package.json +++ b/package.json @@ -121,8 +121,5 @@ "nodemon": "^1.15.1", "prettier": "1.11.1", "webpack-dev-server": "^2.11.2" - }, - "optionalDependencies": { - "fsevents": "^1.1.3" } } diff --git a/yarn.lock b/yarn.lock index 584951b5da0..af7bda5d562 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3605,7 +3605,7 @@ fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" -fsevents@^1.0.0, fsevents@^1.1.3: +fsevents@^1.0.0: version "1.1.3" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8" dependencies: |