diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-19 13:03:54 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-19 13:03:54 +0000 |
| commit | f9fd9b1def8dec9800f8d3857ee278ed6dca03c3 (patch) | |
| tree | 2cbb53d5c73df8dab9e7baf3d7f65230bab06858 /Gemfile.lock | |
| parent | fd86e7432744979c0f17fc0dcca157a6606a15c0 (diff) | |
| parent | 752e9c18a1c2521636ddeec65b7bda2035ce1893 (diff) | |
| download | gitlab-ce-f9fd9b1def8dec9800f8d3857ee278ed6dca03c3.tar.gz | |
Merge branch 'zj-pool-destruction' into 'master'
Leave object pools when destroying projects
Closes gitaly#1415
See merge request gitlab-org/gitlab-ce!23869
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 6d21089c82c..23a2bbeffdd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -274,7 +274,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.3.0) + gitaly-proto (1.5.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-default_value_for (3.1.1) @@ -1008,7 +1008,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.3.0) + gitaly-proto (~> 1.5.0) github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) gitlab-markup (~> 1.6.5) |