summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorAlejandro Rodríguez <alejorro70@gmail.com>2017-10-23 17:31:05 -0300
committerAlejandro Rodríguez <alejorro70@gmail.com>2017-10-23 17:31:48 -0300
commit4969f486f26e614bb8fb69ed12ad1c14c4cfcd04 (patch)
tree8db7f4dd20c75feb745ed6085548d3137e9561ee /Gemfile.lock
parent743050cede59d4ffbd45f2ed0dc4d7f20b75c6bd (diff)
downloadgitlab-ce-4969f486f26e614bb8fb69ed12ad1c14c4cfcd04.tar.gz
Support `Gitaly::User`'s gl_username fieldgitaly-gl-username
We also unify conversions from and to `Gitaly::User`s in the `Gitlab::Git::User` class.
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 601d5ca16e2..53efb1c76c2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -273,7 +273,7 @@ GEM
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
gherkin-ruby (0.3.2)
- gitaly-proto (0.45.0)
+ gitaly-proto (0.48.0)
google-protobuf (~> 3.1)
grpc (~> 1.0)
github-linguist (4.7.6)
@@ -1030,7 +1030,7 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.2.0)
- gitaly-proto (~> 0.45.0)
+ gitaly-proto (~> 0.48.0)
github-linguist (~> 4.7.0)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.6.2)