summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-10-01 13:13:40 +0000
committerNick Thomas <nick@gitlab.com>2018-10-01 13:13:40 +0000
commitdf73116f75d4a7545fb4a7684aa76624efede7d0 (patch)
tree68947c2663e5ef5dffa8a566fcb9dba0c97915cd /Gemfile.lock
parentaac9d70a8c40b819b9d19d66d8a86b439c72f130 (diff)
parenta583f137ddc9833796752b9cf8c07077d76078ba (diff)
downloadgitlab-ce-df73116f75d4a7545fb4a7684aa76624efede7d0.tar.gz
Merge branch '37433-solve-n-1-in-refs-controller-logs-tree' into 'master'
Adds list_last_commits_for_tree as the method call for the Gitaly ListLastCommitsForTree RPC Closes #37433 See merge request gitlab-org/gitlab-ce!21921
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 2f898de09eb..910e07f4a66 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -274,7 +274,7 @@ GEM
gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
- gitaly-proto (0.117.0)
+ gitaly-proto (0.118.1)
google-protobuf (~> 3.1)
grpc (~> 1.10)
github-linguist (5.3.3)
@@ -1028,7 +1028,7 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
- gitaly-proto (~> 0.117.0)
+ gitaly-proto (~> 0.118.1)
github-linguist (~> 5.3.3)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-gollum-lib (~> 4.2)