summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-11-27 15:42:51 +0000
committerNick Thomas <nick@gitlab.com>2018-11-27 15:42:51 +0000
commita54352406ae4d85a8c3352b4f6a7dfe669ecd817 (patch)
tree6e3364b82785ad7f3e3712e046128bfe86da290f /Gemfile.lock
parent397fd09ac4ba7353580f4d3a88c80105d51ff47a (diff)
downloadgitlab-ce-a54352406ae4d85a8c3352b4f6a7dfe669ecd817.tar.gz
Update Gitaly and gitaly-proto
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 f622c6292b2..161bbf77c22 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -273,7 +273,7 @@ GEM
gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
- gitaly-proto (1.1.0)
+ gitaly-proto (1.2.0)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab-default_value_for (3.1.1)
@@ -1006,7 +1006,7 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
- gitaly-proto (~> 1.1.0)
+ gitaly-proto (~> 1.2.0)
github-markup (~> 1.7.0)
gitlab-default_value_for (~> 3.1.1)
gitlab-markup (~> 1.6.5)