diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-12-14 21:58:38 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-12-14 21:58:38 +0300 |
| commit | ee9ad1b1f60374e1b83ef6af481ae7ebdd0e7b2e (patch) | |
| tree | 0e6d32bf1368bdc0df58c712bb469bae226af21b /Gemfile.lock | |
| parent | d7c1a9d9111f4e545155eab2fbdc89ad4925a52f (diff) | |
| parent | 835a5db376a69dce20ba616d480a5a9ab15b2577 (diff) | |
Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master'
Migrate Gitlab::Git::Repository#merge_base_commit to Gitaly
Closes gitaly#808
See merge request gitlab-org/gitlab-ce!15770
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 f2546efa906..55600555e4d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -284,7 +284,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly-proto (0.59.0) + gitaly-proto (0.61.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -1042,7 +1042,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly-proto (~> 0.59.0) + gitaly-proto (~> 0.61.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.6.2) |