diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-02-16 18:24:56 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-03-02 17:41:05 -0600 |
| commit | 6cc4cf1e151fb8da16796d7bbab16bc8a1ac08b6 (patch) | |
| tree | dbc7105aa4ecd6498a9354ad6d9c141fb93d277f /lib | |
| parent | efff35e96873bd3bea0afceb1d3cd102280813f5 (diff) | |
| download | gitlab-ce-6cc4cf1e151fb8da16796d7bbab16bc8a1ac08b6.tar.gz | |
Fix cherry-picking or reverting through an MR
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/commits.rb | 2 | ||||
| -rw-r--r-- | lib/api/v3/commits.rb | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/api/commits.rb b/lib/api/commits.rb index fd03e92264d..b0aa10f8bf2 100644 --- a/lib/api/commits.rb +++ b/lib/api/commits.rb @@ -127,7 +127,7 @@ module API commit_params = { commit: commit, - create_merge_request: false, + start_branch: params[:branch], target_branch: params[:branch] } diff --git a/lib/api/v3/commits.rb b/lib/api/v3/commits.rb index 506204b3517..d254d247042 100644 --- a/lib/api/v3/commits.rb +++ b/lib/api/v3/commits.rb @@ -130,9 +130,7 @@ module API commit_params = { commit: commit, - create_merge_request: false, - source_project: user_project, - source_branch: commit.cherry_pick_branch_name, + start_branch: params[:branch], target_branch: params[:branch] } |