diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-07-07 15:21:05 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-07-07 15:21:05 +0000 |
| commit | 1dab640357fa1ba8992757499e4167fcd4ce6276 (patch) | |
| tree | ded95743dee788d563abeb0c9638679ef0dfd879 /Gemfile.lock | |
| parent | a77158ff31d84bf978038e5c3c7aec3faa509035 (diff) | |
| parent | c393d88df3b815bf6cbfad37ef20b8e70313563d (diff) | |
| download | gitlab-ce-1dab640357fa1ba8992757499e4167fcd4ce6276.tar.gz | |
Merge branch 'feature/migrate-commit-count-to-gitaly' into 'master'
Migrate Gitlab::Git::Repository#commit_count to Gitaly
Closes gitaly#355
See merge request !12688
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 70abc0669df..ba580bd1309 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -278,7 +278,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly (0.9.0) + gitaly (0.13.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -980,7 +980,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly (~> 0.9.0) + gitaly (~> 0.13.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.5.1) |