summaryrefslogtreecommitdiff
path: root/lib/api/commits.rb
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-26 11:13:42 +0000
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-26 11:13:42 +0000
commitca6cc6014eed02b2e74bc8ffe65d3c1cc2e511b4 (patch)
tree2c7f9b643463a69b5010b8942eaa2e3c58fd59c9 /lib/api/commits.rb
parentaf6e3e57e4c0ee861e26310c65be2e5e8547ca68 (diff)
parent52bd4b88dc557f0b3c63e82d0f2093f22b28ae9d (diff)
downloadgitlab-ce-ca6cc6014eed02b2e74bc8ffe65d3c1cc2e511b4.tar.gz
Merge branch 'master' into 'add-sentry-js-again-with-vue'
# Conflicts: # config/webpack.config.js
Diffstat (limited to 'lib/api/commits.rb')
-rw-r--r--lib/api/commits.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/commits.rb b/lib/api/commits.rb
index 66b37fd2bcc..621b9dcecd9 100644
--- a/lib/api/commits.rb
+++ b/lib/api/commits.rb
@@ -62,7 +62,7 @@ module API
post ":id/repository/commits" do
authorize! :push_code, user_project
- attrs = declared_params.merge(start_branch: declared_params[:branch], target_branch: declared_params[:branch])
+ attrs = declared_params.merge(start_branch: declared_params[:branch], branch_name: declared_params[:branch])
result = ::Files::MultiService.new(user_project, current_user, attrs).execute
@@ -140,7 +140,7 @@ module API
commit_params = {
commit: commit,
start_branch: params[:branch],
- target_branch: params[:branch]
+ branch_name: params[:branch]
}
result = ::Commits::CherryPickService.new(user_project, current_user, commit_params).execute