diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-23 10:39:01 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-23 10:39:01 +0000 |
| commit | d546f7d36e6703bda430e2f50fe4e87a07ab48f8 (patch) | |
| tree | 2f146ced371825eb0ac5e6450bd9c37e4fff9896 /Gemfile.lock | |
| parent | 1f456ff3649e0a26785aaddf979bb8ce0d56f17a (diff) | |
| parent | 258d5a50e63d5e29b6a3adc0a250727a8232695b (diff) | |
| download | gitlab-ce-d546f7d36e6703bda430e2f50fe4e87a07ab48f8.tar.gz | |
Merge branch 'gitaly-commit-patch' into 'master'
Incorporate DiffService.CommitPatch Gitaly RPC
Closes gitaly#463
See merge request !13441
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 ec8349cd1df..e4b721279b0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -275,7 +275,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly (0.29.0) + gitaly (0.30.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -1019,7 +1019,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly (~> 0.29.0) + gitaly (~> 0.30.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.5.1) |