diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-26 11:26:10 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-26 11:26:10 +0000 |
| commit | c3633db6176a3e72903601400a965fc8c44a2cb1 (patch) | |
| tree | 16779d3e748b3e089d5e74663a70d6fe9d1b1d37 /lib/api/files.rb | |
| parent | 0453d6d7ae72f0179d02ff5190122a86e304e1bb (diff) | |
| parent | f00bb1c29ea438be66b3766545a57b468ade37d4 (diff) | |
| download | gitlab-ce-c3633db6176a3e72903601400a965fc8c44a2cb1.tar.gz | |
Merge branch 'master' into 'balsalmiq-support'
# Conflicts:
# config/webpack.config.js
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) |