summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-06-08 11:49:13 +0000
committerDouwe Maan <douwe@gitlab.com>2018-06-08 11:49:13 +0000
commitf068479e637c52b839c3474a87c2d01e82ba0829 (patch)
tree07cb0c54629d9374677de06f0ebf1de3766a92e5 /Gemfile.lock
parentd0a040d315f160a1f6700cdb2aa8d194c2104f55 (diff)
parent2bbac66cae09a1dde81121399daa56bf166dd78e (diff)
downloadgitlab-ce-f068479e637c52b839c3474a87c2d01e82ba0829.tar.gz
Merge branch 'use-restore-custom-hooks-gitaly' into 'master'
Use RestoreCustomHooks RPC in restore rake task See merge request gitlab-org/gitlab-ce!19370
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 5f8d1a8fa68..936cd9e8e47 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -283,7 +283,7 @@ GEM
gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
- gitaly-proto (0.100.0)
+ gitaly-proto (0.101.0)
google-protobuf (~> 3.1)
grpc (~> 1.10)
github-linguist (5.3.3)
@@ -1040,7 +1040,7 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
- gitaly-proto (~> 0.100.0)
+ gitaly-proto (~> 0.101.0)
github-linguist (~> 5.3.3)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-gollum-lib (~> 4.2)