diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-04-21 15:51:33 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-21 15:51:33 +0800 |
| commit | b43cabaf497988c0efee7106770c17be10d3da1b (patch) | |
| tree | 7c30cfd403f4bf8a74011d192516c0c9c20d4469 /lib/api/files.rb | |
| parent | 8a570944a9d0f0e4cd607e5d2dfe2eac4bd83f47 (diff) | |
| parent | 4b37961539ea08d4a28f78de763e719f50ba6470 (diff) | |
| download | gitlab-ce-b43cabaf497988c0efee7106770c17be10d3da1b.tar.gz | |
Merge remote-tracking branch 'upstream/master' into sh-fix-issue-31215
* upstream/master: (109 commits)
Update CI templates to include 9.1 templates
Change spec folder to match the assets one
Update style_guide_js.md
Milestones documentation refactor
Adds documentation entry: Don't user forEach, aim for code without side effects
Move kube namespace section to the variables one
Changed milestone.to_reference calls into milestone.title for the show, edit and top views
Update move icon to match others
Issue Title Show Focus Check On Load
Update Kubernetes namespace documentation
Store projects in metrics for email replies
Refactor into .vue files
Adds vue js example application and documentation
Add ES lint support to identify poorly written Promises
Update plantuml.md to add the actual link.
Fixed wording
Add metrics events for incoming emails
Remove helpers assigned_issuables_count and cached_assigned_issuables_count
Refactor into .vue files part 2
Fix headings
...
Diffstat (limited to 'lib/api/files.rb')
| -rw-r--r-- | lib/api/files.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/files.rb b/lib/api/files.rb index 33fc970dc09..e6ea12c5ab7 100644 --- a/lib/api/files.rb +++ b/lib/api/files.rb @@ -5,7 +5,7 @@ module API { file_path: attrs[:file_path], start_branch: attrs[:branch], - target_branch: attrs[:branch], + branch_name: attrs[:branch], commit_message: attrs[:commit_message], file_content: attrs[:content], file_content_encoding: attrs[:encoding], @@ -130,7 +130,7 @@ module API authorize! :push_code, user_project file_params = declared_params(include_missing: false) - result = ::Files::DestroyService.new(user_project, current_user, commit_params(file_params)).execute + result = ::Files::DeleteService.new(user_project, current_user, commit_params(file_params)).execute if result[:status] != :success render_api_error!(result[:message], 400) |