diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2015-12-25 14:21:14 +0200 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2015-12-25 14:21:14 +0200 |
| commit | 05f8c585f71256bf07c83efba2beb516efd72c4c (patch) | |
| tree | 5f5ea48835898657c4fd6defd8527ad78ad4547c /lib/api/files.rb | |
| parent | a3de46654b2fe0f02995913a771e6423bb584d64 (diff) | |
| parent | ed777c7bcc990e5e3ff9f8e0d28a1e23af44d8f1 (diff) | |
| download | gitlab-ce-05f8c585f71256bf07c83efba2beb516efd72c4c.tar.gz | |
Merge branch 'master' into adding_crime_security
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], |