summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock14
1 files changed, 10 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 1c6c7edb1a0..00106e6f415 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,12 @@
+GIT
+ remote: https://gitlab.com/gitlab-org/gitaly-proto.git
+ revision: 9fa062ff6b1580f57ac30091a385fa8dea24b475
+ ref: fix/large-commit-tag-message
+ specs:
+ gitaly-proto (0.89.0)
+ google-protobuf (~> 3.1)
+ grpc (~> 1.0)
+
GEM
remote: https://rubygems.org/
specs:
@@ -288,9 +297,6 @@ GEM
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
gherkin-ruby (0.3.2)
- gitaly-proto (0.88.0)
- google-protobuf (~> 3.1)
- grpc (~> 1.0)
github-linguist (5.3.3)
charlock_holmes (~> 0.7.5)
escape_utils (~> 1.1.0)
@@ -1056,7 +1062,7 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.2.0)
- gitaly-proto (~> 0.88.0)
+ gitaly-proto!
github-linguist (~> 5.3.3)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.6.2)