diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-07-21 14:28:48 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-07-21 14:28:48 +0000 |
| commit | 1ce523c1331e7e541f41d8733d1b9d7f729dcca5 (patch) | |
| tree | a41ed85c532a341b4befe11ba242c6304578c129 /Gemfile.lock | |
| parent | d0da5852335251e4fa7dfbc37ff138b2a3c83cfb (diff) | |
| parent | b043100b65b0b5ac2cf0465864678181783c58bc (diff) | |
| download | gitlab-ce-1ce523c1331e7e541f41d8733d1b9d7f729dcca5.tar.gz | |
Merge branch 'feature/migrate-commit-find-all-to-gitaly' into 'master'
Migrate Gitlab::Git::Commit.find_all to Gitaly
Closes gitaly#396
See merge request !12934
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 83723b6ee9a..b0b437ae342 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.17.0) + gitaly (0.18.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -970,7 +970,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly (~> 0.17.0) + gitaly (~> 0.18.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.5.1) |