diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-06-20 19:45:46 +0700 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-07-05 17:15:10 +0700 |
| commit | 48307fac1ec7cd207fbd53762fd1226a9d6fb1a2 (patch) | |
| tree | 92b3d9b65dd6e541dd09acda541e5c291448fb09 /Gemfile.lock | |
| parent | 9414a41f8390511005702ab4fec99239b6c3c6dd (diff) | |
| download | gitlab-ce-48307fac1ec7cd207fbd53762fd1226a9d6fb1a2.tar.gz | |
Extend MergeToRefService for creating merge ref from the other ref
Currently, MergeToRefService is specifically designed for
createing merge commits from source branch and target branch of
merge reqeusts. We extend this behavior to source branch and any
target ref paths.
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 5b648d43137..5099167e03f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -303,7 +303,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.32.0) + gitaly-proto (1.36.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-labkit (0.3.0) @@ -1092,7 +1092,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.32.0) + gitaly-proto (~> 1.36.0) github-markup (~> 1.7.0) gitlab-labkit (~> 0.3.0) gitlab-markup (~> 1.7.0) |