Merge branch 'fix-gemfile-lock' into 'master'

Fix gitaly-proto version in Gemfile.lock See merge request gitlab-org/gitlab-ce!14651

Merge branch 'fix-gemfile-lock' into 'master'
00460a9d · Sean McGivern · 5b56cd3b · 6396d4c3 · 00460a9d
Commit 00460a9d authored Oct 03, 2017 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1025,7 +1025,7 @@ DEPENDENCIES
  gettext (~> 3.2.2)
  gettext_i18n_rails (~> 1.8.0)
  gettext_i18n_rails_js (~> 1.2.0)
-  gitaly-proto (~> 0.38.0)
+  gitaly-proto (~> 0.39.0)
  github-linguist (~> 4.7.0)
  gitlab-flowdock-git-hook (~> 1.0.1)
  gitlab-markup (~> 1.6.2)