diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-24 21:19:17 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-24 21:19:17 +0100 |
commit | ef8b1dbf21a90f719c2e8b8c052e16f6107193c6 (patch) | |
tree | 6138768916e7b65a7955e8e8c4ed1eb1541e8ced /lib/api/files.rb | |
parent | 32543f3bd94b1b66dd949b0fb1f57bff3732eb45 (diff) | |
parent | e3befaed82f9aa52c79a1d4c437fe4fc63f8d07a (diff) | |
download | gitlab-ce-ef8b1dbf21a90f719c2e8b8c052e16f6107193c6.tar.gz |
Merge branch 'master' into milestone-ref
Diffstat (limited to 'lib/api/files.rb')
-rw-r--r-- | lib/api/files.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/files.rb b/lib/api/files.rb index a7a768f8895..8ad2c1883c7 100644 --- a/lib/api/files.rb +++ b/lib/api/files.rb @@ -7,7 +7,7 @@ module API def commit_params(attrs) { file_path: attrs[:file_path], - current_branch: attrs[:branch_name], + source_branch: attrs[:branch_name], target_branch: attrs[:branch_name], commit_message: attrs[:commit_message], file_content: attrs[:content], |