diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-04-03 19:50:28 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-04-03 19:50:28 +0800 |
| commit | 1fe57d3f01f8fc7a6f0f71e63d0562512d1e5506 (patch) | |
| tree | 0f1945a23ccb3fa5b2aee255f24cab2d314cc798 /yarn.lock | |
| parent | 437f59c2fe326552f27fc13289cb2b727f173baa (diff) | |
| parent | 98278abd590198832c09445ee69df4df6cd006a2 (diff) | |
| download | gitlab-ce-1fe57d3f01f8fc7a6f0f71e63d0562512d1e5506.tar.gz | |
Merge remote-tracking branch 'upstream/master' into qa-add-more-key-tests
* upstream/master: (147 commits)
Replace the `project/issues/issues.feature` spinach test with an rspec analog
[Rails5] Isolate `test_after_commit` gem
backport missing object storage worker specs
Resolve "Clicking confidential and lock icons on sidebar should also activate dropdown"
Add button type to settings toggle
Move Sidekiq exporter logs to log/sidekiq_exporter.log
Rename allow_private_networks to allow_local_network
Make error messages even more descriptive
Added rescue to show a custom error when testing project integrations
Raise more descriptive errors when URLs are blocked
Backport changes in EE MR 4972: System Header and Footer
Adds validators and rack cookie helper
apply feedback
add changelog
fix the rake task from being to strict about Group
Bump html-pipeline to 2.7.1
Update docs for API for issue and merge request description templates
Add pagination docs to commit status API
Update brakeman 3.6.1 to 4.2.1
Handle CR-LFs properly in .gitmodules file
...
Diffstat (limited to 'yarn.lock')
| -rw-r--r-- | yarn.lock | 2 |
1 files changed, 1 insertions, 1 deletions
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: |