diff options
author | Rémy Coutable <remy@rymai.me> | 2017-02-22 11:47:13 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-02-22 11:47:13 +0000 |
commit | 87411889b9c8a778bebafeaa381e1d736af7329a (patch) | |
tree | 338e2628a8b7b95572fb1bacf3ea8b8272c3929c /lib/api/files.rb | |
parent | 99d0bc3d5521785f14330ef8cb2160c2bececeee (diff) | |
parent | c79bbe26ab1e16facddaf159d4d074937586d742 (diff) | |
download | gitlab-ce-87411889b9c8a778bebafeaa381e1d736af7329a.tar.gz |
Merge branch '22132-rename-branch-name-params-to-branch' into 'master'
Standardize branch name params as `branch` on V4 API
Closes #22132
See merge request !8936
Diffstat (limited to 'lib/api/files.rb')
-rw-r--r-- | lib/api/files.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/api/files.rb b/lib/api/files.rb index 6e16ccd2fd8..500f9d3c787 100644 --- a/lib/api/files.rb +++ b/lib/api/files.rb @@ -4,8 +4,8 @@ module API def commit_params(attrs) { file_path: attrs[:file_path], - start_branch: attrs[:branch_name], - target_branch: attrs[:branch_name], + start_branch: attrs[:branch], + target_branch: attrs[:branch], commit_message: attrs[:commit_message], file_content: attrs[:content], file_content_encoding: attrs[:encoding], @@ -17,13 +17,13 @@ module API def commit_response(attrs) { file_path: attrs[:file_path], - branch_name: attrs[:branch_name] + branch: attrs[:branch] } end params :simple_file_params do requires :file_path, type: String, desc: 'The path to new file. Ex. lib/class.rb' - requires :branch_name, type: String, desc: 'The name of branch' + requires :branch, type: String, desc: 'The name of branch' requires :commit_message, type: String, desc: 'Commit Message' optional :author_email, type: String, desc: 'The email of the author' optional :author_name, type: String, desc: 'The name of the author' |