summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-10-12 17:52:09 -0500
committerMike Greiling <mike@pixelcog.com>2017-10-12 17:52:09 -0500
commit53e11239ce9e7f9513c890a78df41c611bcc2ae1 (patch)
tree08300d49b78dff43f95e52cc298fa8732b9a32a9 /Gemfile
parentd8cc4540ab83c98a09b11d1654fac593c47384c8 (diff)
parent8d47e9f8e13c2ca43520b348dde0424fe6460cc9 (diff)
downloadgitlab-ce-53e11239ce9e7f9513c890a78df41c611bcc2ae1.tar.gz
Merge branch 'master' into sh-headless-chrome-support
* master: (104 commits) Update licenses fix a wrong method call in the refactor fix a whitespace fix for discussion Update templates via: Update doc accordingly to: Cache issuable template names Fix the format of rugged alternate directory list Match full file path in FileDetector Fixes from CSS refactor Resolve "Prometheus service page shows error" Explicit state integration deletion Move all API authentication code to APIGuard Shorten example translation for inclusive language [ci-skip] add changelog fix the merger override to remove source branch add spec Removed d3.js from the users and graphs bundle Cleanup data-page attribute after each Karma test Update template description wording ...
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index e43370b1ab6..0dca265d1c7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -398,7 +398,7 @@ group :ed25519 do
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.39.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.41.0', require: 'gitaly'
gem 'toml-rb', '~> 0.3.15', require: false