diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-07-20 14:31:06 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-07-20 14:31:06 +0000 |
| commit | ca80d589a62d38c1e3128e99595ea237e45959bd (patch) | |
| tree | 236c60fa31324d8f77fdde92616bda7e4eb0a9dc /Gemfile.lock | |
| parent | b6555693a8e445405c5746b7c76c9f603395bba2 (diff) | |
| parent | ef2b81adb442f739216e9785dd890de952a12d23 (diff) | |
| download | gitlab-ce-ca80d589a62d38c1e3128e99595ea237e45959bd.tar.gz | |
Merge branch 'feature/send-diff-limits-to-gitaly' into 'master'
Migrate DiffCollection limiting logic to Gitaly
See merge request !12867
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 dfa7acc8917..0c4fc1fee0c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -269,7 +269,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly (0.14.0) + gitaly (0.17.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -972,7 +972,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly (~> 0.14.0) + gitaly (~> 0.17.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.5.1) |