diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-10-02 15:17:48 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-10-02 15:17:48 -0500 |
| commit | c0dffdff401ce6d78b9373bdbbc50ee242a2bf24 (patch) | |
| tree | 093706a91560cca635a9e9feff4c04d301e760cc /yarn.lock | |
| parent | a9df7d866dc726ded2cb0a295a4af68a010201e2 (diff) | |
| parent | 9ab5910065c22b6e26fd7906d32bf457f3abb07d (diff) | |
| download | gitlab-ce-c0dffdff401ce6d78b9373bdbbc50ee242a2bf24.tar.gz | |
Merge branch 'master' into 43511-upgrade-to-babel-7
* master: (30 commits)
Refactor quick actions docs into multiple tables
CE Resolve "Refactor code quality similar to JUnit tests"
Fix rename_login_root_namespaces post migration
Merge branch 'master-i18n' into 'master'
Hides Close MR button on merged MR
Show the commit-sha for pre-release versions
Resolve "Add "Link" shortcut/icon in markdown editor to make it easier to add references"
Use tiller locally for Auto Devops
Improve logging when username update fails due to registry tags
[QA] Improve admin hashed-storage settings
circumvent browser cache on browser back navigation
Highlight current user in comments and system notes
Resolve "Selecting an autofill suggestion for project name will not update the project slug"
Update Workhorse to 7.0.0 for Gitaly's new auth scheme
Update to Rouge 3.3.0 including frozen string literals for improved memory usage
Don't check for the groups list before filtering
Add missing changelog type [ci skip]
Filter issues without an Assignee via the API
Make single diff patch limit configurable
Add yarn integrity hashes
...
Diffstat (limited to 'yarn.lock')
| -rw-r--r-- | yarn.lock | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/yarn.lock b/yarn.lock index 023a5f082fd..9a8078ceb5b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1039,8 +1039,9 @@ babel-loader@^8.0.4: babel-messages@^6.23.0: version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz#875d6bc9be761c58a2ae3feee5dc4895d8c7f921" dependencies: + babel-plugin-syntax-object-rest-spread "^6.8.0" babel-runtime "^6.22.0" babel-plugin-istanbul@^5.1.0: |