diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-08-07 21:29:32 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-08-07 21:29:32 +0000 |
| commit | 6085ce1352eee7b3e18b014f0f68719cae780da8 (patch) | |
| tree | 5a110cc7ed6302f9db29cc3fd09cb77babe2d538 /Gemfile.lock | |
| parent | c94990820a2ea3cfc16099e318fcce5354a3c052 (diff) | |
| parent | c4f55ce32d6160b43c518954219cca69077b5001 (diff) | |
| download | gitlab-ce-6085ce1352eee7b3e18b014f0f68719cae780da8.tar.gz | |
Merge branch 'feature/migrate-repository-size-to-gitaly' into 'master'
Migrate Gitlab::Git::Repository#size to Gitaly
Closes gitaly#437
See merge request !13259
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 8bbd8cce322..948ba02a72c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -270,7 +270,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly (0.24.0) + gitaly (0.26.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -982,7 +982,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly (~> 0.24.0) + gitaly (~> 0.26.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.5.1) |