diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-07 15:11:30 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-07 15:11:30 +0000 |
| commit | 6d8810a64f944ff96af54e5c759f866bb68a7453 (patch) | |
| tree | 8a7f19772e7f38c498cba6b73ca43b5e911705b3 /Gemfile.lock | |
| parent | f323d6148b7b71609cbd32ab9db4724fc108729d (diff) | |
| parent | 28cbb2acfe413148ff23b8ed4b3293e09ab376f5 (diff) | |
| download | gitlab-ce-6d8810a64f944ff96af54e5c759f866bb68a7453.tar.gz | |
Merge branch 'fj-41213-api-update-submodule-commit' into 'master'
Add endpoint to update a git submodule reference
Closes #41213
See merge request gitlab-org/gitlab-ce!20949
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 4ad9613989d..50e3ddef1e1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -269,9 +269,8 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (0.118.1) - google-protobuf (~> 3.1) - grpc (~> 1.10) + gitaly-proto (0.123.0) + grpc (~> 1.0) github-markup (1.7.0) gitlab-markup (1.6.4) gitlab-sidekiq-fetcher (0.3.0) @@ -994,7 +993,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 0.118.1) + gitaly-proto (~> 0.123.0) github-markup (~> 1.7.0) gitlab-markup (~> 1.6.4) gitlab-sidekiq-fetcher @@ -1152,4 +1151,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.16.6 + 1.17.1 |