diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-08 19:19:52 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-08 19:19:52 +0000 |
| commit | e2b759a2f483663e0771180de6b97bb9344a56cd (patch) | |
| tree | 32cd72a70e405dc0858d774ca3354d6aef1bf445 /yarn.lock | |
| parent | 7ca5a3f99dd3a3c1800f65da7b4f08395a97395a (diff) | |
| parent | df74461014bbdbc691f4f4039b02962dad292362 (diff) | |
| download | gitlab-ce-e2b759a2f483663e0771180de6b97bb9344a56cd.tar.gz | |
Merge branch 'master' into 34312-eslint-vue-plugin
* master: (140 commits)
Add Gitter room link to I want to contribute since you always have questions
Use workhorse 3.4.0
chore: remove symbolic link
Add memoization for properties
Resolve "Allow QA tests to run with `CHROME_HEADLESS=false`"
Resolve "Add graph value to hover"
Fix slash commands dropdown description
disables the shortcut to the issue boards when issues are disabled
Fix static analysys
Disable STI of ActiveRecord. Refactoring specs.
Fix StaticSnalysys
Fix change log
Add changelog
Revert bulk_insert and bring back AR insert(one by one)
Add a new test for emptified params
Use batch update for Service deactivation
Fix query to look for proper unmanaged kubernetes service
Fix static anylysy
Use bulk_insert instead of AR create
Opitmize migration process by using both unmanaged_kubernetes_service and kubernetes_service_without_template
...
Diffstat (limited to 'yarn.lock')
| -rw-r--r-- | yarn.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/yarn.lock b/yarn.lock index ba7d9eb70b8..3c792d8d7ee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -54,9 +54,9 @@ lodash "^4.2.0" to-fast-properties "^2.0.0" -"@gitlab-org/gitlab-svgs@^1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.4.0.tgz#83c0a76485c1378babf2e83456b4d2442efa98e8" +"@gitlab-org/gitlab-svgs@^1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.5.0.tgz#6635df6aad6c71fb293ff113efd4311a744c0e2c" "@types/jquery@^2.0.40": version "2.0.48" |