diff options
| author | Ahmad Sherif <me@ahmadsherif.com> | 2017-12-06 16:54:57 +0100 |
|---|---|---|
| committer | Ahmad Sherif <me@ahmadsherif.com> | 2017-12-13 17:40:19 +0100 |
| commit | 835a5db376a69dce20ba616d480a5a9ab15b2577 (patch) | |
| tree | 0ecba5bbfa679966cba50e62b0ff19c4d944fc12 /Gemfile.lock | |
| parent | 689bc9ea6db102006b548e6176125157955c7f2b (diff) | |
| download | gitlab-ce-835a5db376a69dce20ba616d480a5a9ab15b2577.tar.gz | |
Migrate Gitlab::Git::Repository#merge_base_commit to Gitalyfeature/migrate-merge-base-to-gitaly
Closes gitaly#808
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 b5ca351fea8..f318b9cc353 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -281,7 +281,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) @@ -1038,7 +1038,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) |