diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-02-06 17:03:39 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-02-06 17:03:39 +0000 |
| commit | b0e2e76004500ddf21fa612fdedc2849d9d43cbe (patch) | |
| tree | 8830b2bbe02e7ac5a4137e0f33c3ae5d231127db /Gemfile.lock | |
| parent | 4551ca22c49a26cb2bbcd3484691acad5d453c8f (diff) | |
| parent | f929411c6da8ddc890cd2d30df632984d1554ad3 (diff) | |
| download | gitlab-ce-b0e2e76004500ddf21fa612fdedc2849d9d43cbe.tar.gz | |
Merge branch 'sh-log-project-name-with-gitaly' into 'master'
Send project name with Gitaly repository requests
Closes gitaly#1394
See merge request gitlab-org/gitlab-ce!23373
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f661da41507..0b2bd2c96bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -278,7 +278,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.5.0) + gitaly-proto (1.10.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-default_value_for (3.1.1) @@ -1020,7 +1020,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.5.0) + gitaly-proto (~> 1.10.0) github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) gitlab-markup (~> 1.6.5) |