diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-06-02 19:39:02 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-06-02 19:39:02 +0000 |
| commit | 993412f9dea0ffb75d9f66ce47e13679cf479f5e (patch) | |
| tree | e8062b136a3bd59a828b8a0f8c95b269ebc15e66 /Gemfile.lock | |
| parent | 3cdac884c77534b2a8572cdc2660d1fd93d05bce (diff) | |
| parent | 4d1e987ec3263feda7a2f3469e31f5839e25731b (diff) | |
| download | gitlab-ce-993412f9dea0ffb75d9f66ce47e13679cf479f5e.tar.gz | |
Merge branch 'fix/use-new-gitaly-commit-diff-rpc' into 'master'
Use the new Gitaly CommitDiff RPC
See merge request !11826
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 f8adfec6143..be1f6555851 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -272,7 +272,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly (0.7.0) + gitaly (0.8.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -933,7 +933,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly (~> 0.7.0) + gitaly (~> 0.8.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.5.1) |