diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-07 09:46:13 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-07 09:46:13 +0000 |
| commit | 8f7638798dc91373c4b58d697e11f01f99a4ca6d (patch) | |
| tree | 309984e38a6963416fa444cbe8ba22e5e32e4422 /Gemfile.lock | |
| parent | 424c46731018f0232e2b6341f474100cb185c05a (diff) | |
| parent | c2e99b40f71ca7036cc07596aae164e92378263b (diff) | |
| download | gitlab-ce-8f7638798dc91373c4b58d697e11f01f99a4ca6d.tar.gz | |
Merge branch 'gitaly-tree-entries-fix' into 'master'
Implement fix for n+1 issue on `flatten_tree` helper
Closes gitaly#530
See merge request !14097
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 f7ae8bddd6d..5e3d12544fc 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-proto (0.32.0) + gitaly-proto (0.33.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -1022,7 +1022,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly-proto (~> 0.32.0) + gitaly-proto (~> 0.33.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.5.1) |