summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2018-11-21 18:28:34 +0100
committerBob Van Landuyt <bob@vanlanduyt.co>2018-11-26 16:44:26 +0100
commit5e9921d547501fc8be2ebd16b63eec712154db10 (patch)
treec1907d1cad0c0fc12c496803975cf2b0e5df939b /Gemfile.lock
parent1c1b7a820db168974289039acd9f1f89664b684e (diff)
downloadgitlab-ce-5e9921d547501fc8be2ebd16b63eec712154db10.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 5ceb5d29252..f70ee9f4c77 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -272,7 +272,7 @@ GEM
gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
- gitaly-proto (0.123.0)
+ gitaly-proto (1.1.0)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab-default_value_for (3.1.1)
@@ -1005,7 +1005,7 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
- gitaly-proto (~> 0.123.0)
+ gitaly-proto (~> 1.1.0)
github-markup (~> 1.7.0)
gitlab-default_value_for (~> 3.1.1)
gitlab-markup (~> 1.6.5)