diff options
author | Valery Sizov <valery@gitlab.com> | 2015-12-24 14:57:07 +0200 |
---|---|---|
committer | Valery Sizov <valery@gitlab.com> | 2015-12-24 14:57:07 +0200 |
commit | 44cf1cbaafa3be1c284f202dcc67c734bbba1a8e (patch) | |
tree | c9b5824fd41cc3efa8d4b62b1e7540e729aac6d6 /lib/api/files.rb | |
parent | 6d0705474791c2071153794e9be8df69375e1028 (diff) | |
parent | d1043c4389cd92d33ff21c3fd994e78cf4d66dba (diff) | |
download | gitlab-ce-emoji-picker-search.tar.gz |
Merge remote-tracking branch 'origin/master' into emoji-picker-searchemoji-picker-search
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], |