Merge branch 'master' into 'update-kubeclient'

Conflicts: Gemfile.lock

Merge branch 'master' into 'update-kubeclient'
83874edb · Grzegorz Bizon · 53e2987b · ea5221ae · 83874edb · 83874edb
Commit 83874edb authored 6 years ago by Grzegorz Bizon
--- a/spec/services/merge_requests/merge_request_diff_cache_service_spec.rb
+++ b/spec/services/merge_requests/merge_request_diff_cache_service_spec.rb
--- a/spec/services/projects/create_service_spec.rb
+++ b/spec/services/projects/create_service_spec.rb
--- a/spec/services/projects/fork_service_spec.rb
+++ b/spec/services/projects/fork_service_spec.rb
--- a/spec/services/projects/transfer_service_spec.rb
+++ b/spec/services/projects/transfer_service_spec.rb
--- a/spec/services/projects/update_service_spec.rb
+++ b/spec/services/projects/update_service_spec.rb
--- a/vendor/assets/javascripts/peek.js
+++ b/vendor/assets/javascripts/peek.js
--- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
+++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
--- a/yarn.lock
+++ b/yarn.lock