summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-10-13 13:07:49 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-10-13 13:07:49 +0000
commitd7326003a0317a5abc98a830bfac2f54ad752c08 (patch)
tree547d069da4635b4753f77cb08b26adf777a145ce /Gemfile.lock
parent5e0fca33220708e16f3862aa93b49fade8d719a5 (diff)
parent0aff29f96b54e8036fe46315adb45295bc6c9efd (diff)
downloadgitlab-ce-d7326003a0317a5abc98a830bfac2f54ad752c08.tar.gz
Merge branch 'gitaly-merge' into 'master'
Merge Merge Requests via Gitaly Closes gitaly#654 See merge request gitlab-org/gitlab-ce!14791
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 345fc0a9ac0..afb0b6b471d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -273,7 +273,7 @@ GEM
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
gherkin-ruby (0.3.2)
- gitaly-proto (0.41.0)
+ gitaly-proto (0.42.0)
google-protobuf (~> 3.1)
grpc (~> 1.0)
github-linguist (4.7.6)
@@ -1030,7 +1030,7 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.2.0)
- gitaly-proto (~> 0.41.0)
+ gitaly-proto (~> 0.42.0)
github-linguist (~> 4.7.0)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.6.2)