Merge remote-tracking branch 'ee/master' into ce-to-ee-2018-03-06
* ee/master: Add project export API Lock gRPC gem to 1.8 Add spec Fix http_io to make it return path is nil Add find-sec-bugs in the list of tools for java SAST. Refs #4123 Changes after review Fix broken empty tab state Manage empty states in Pipelines page Adds i18n Adds test Merge from CE
Showing
... | ... | @@ -427,6 +427,10 @@ end |
# Gitaly GRPC client | ||
gem 'gitaly-proto', '~> 0.88.0', require: 'gitaly' | ||
# Explicitly lock grpc as we know 1.9 is bad | ||
# 1.10 is still being tested. See gitlab-org/gitaly#1059 | ||
gem 'grpc', '~> 1.8.3' | ||
# Locked until https://github.com/google/protobuf/issues/4210 is closed | ||
gem 'google-protobuf', '= 3.5.1' | ||
... | ... |
This diff is collapsed.
lib/api/project_export.rb
0 → 100644
This diff is collapsed.
Please register or sign in to comment