Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-06
# Conflicts: # app/models/ci/job_artifact.rb # app/views/layouts/nav/sidebar/_group.html.haml # app/views/projects/clusters/index.html.haml # app/workers/build_finished_worker.rb # lib/api/users.rb # locale/gitlab.pot # spec/javascripts/clusters/clusters_bundle_spec.js # spec/models/ci/job_artifact_spec.rb # spec/models/project_services/kubernetes_service_spec.rb # spec/requests/api/jobs_spec.rb # spec/uploaders/job_artifact_uploader_spec.rb [ci skip]
Showing
... | ... | @@ -427,6 +427,8 @@ end |
# Gitaly GRPC client | ||
gem 'gitaly-proto', '~> 0.83.0', require: 'gitaly' | ||
# Locked until https://github.com/google/protobuf/issues/4210 is closed | ||
gem 'google-protobuf', '= 3.5.1' | ||
gem 'toml-rb', '~> 0.3.15', require: false | ||
... | ... |
Please register or sign in to comment