diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-08-04 15:40:19 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-08-04 15:40:19 +0000 |
| commit | 7e45159f0d8b2e0b6963f40f1a2a54ec1171a2c0 (patch) | |
| tree | aaffde04a2a56ee56ecc7990e011e4655a093369 /Gemfile.lock | |
| parent | 83dafcb58101953ef0a3ff591922840c7b6a080f (diff) | |
| parent | 03440eed20cc36a2f9836dc078d2101849e11319 (diff) | |
| download | gitlab-ce-7e45159f0d8b2e0b6963f40f1a2a54ec1171a2c0.tar.gz | |
Merge branch 'feature/migrate-load-blame-to-gitaly' into 'master'
Migrate blame loading to Gitaly
Closes gitaly#421
See merge request !13155
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 73f45f3ccb6..57cfe0a9de0 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.23.0) + gitaly (0.24.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -974,7 +974,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly (~> 0.23.0) + gitaly (~> 0.24.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.5.1) |