Merge branch 'ce-to-ee-2018-10-24' into 'master'
CE upstream - 2018-10-24 16:21 UTC Closes gitlab-ce#51859, #6875, and gitlab-org/release/framework#23 See merge request gitlab-org/gitlab-ee!8068
Showing
... | ... | @@ -432,8 +432,7 @@ end |
gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly' | ||
gem 'grpc', '~> 1.15.0' | ||
# Locked until https://github.com/google/protobuf/issues/4210 is closed | ||
gem 'google-protobuf', '= 3.5.1' | ||
gem 'google-protobuf', '~> 3.6' | ||
gem 'toml-rb', '~> 1.0.0', require: false | ||
... | ... |
... | ... | @@ -24,7 +24,7 @@ |
"@babel/plugin-syntax-dynamic-import": "^7.0.0", | ||
"@babel/plugin-syntax-import-meta": "^7.0.0", | ||
"@babel/preset-env": "^7.1.0", | ||
"@gitlab-org/gitlab-svgs": "^1.32.0", | ||
"@gitlab-org/gitlab-svgs": "^1.33.0", | ||
"@gitlab-org/gitlab-ui": "^1.8.0", | ||
"autosize": "^4.0.0", | ||
"axios": "^0.17.1", | ||
... | ... |
Please register or sign in to comment