diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-03 11:51:04 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-03 11:51:04 +0000 |
| commit | 00460a9d64cea87fc5887731dc35f4750b8f356d (patch) | |
| tree | 2dd156b2acefd14dd3a62de58fdedcbeb74ace1a | |
| parent | 5b56cd3b59e39a976217ee872fbbb185c012b655 (diff) | |
| parent | 6396d4c3fe51a85f6b1270c25555579d397a1f3f (diff) | |
| download | gitlab-ce-00460a9d64cea87fc5887731dc35f4750b8f356d.tar.gz | |
Merge branch 'fix-gemfile-lock' into 'master'
Fix gitaly-proto version in Gemfile.lock
See merge request gitlab-org/gitlab-ce!14651
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index aa0c5148b1a..e1bb5d0854d 100644 --- 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) |