diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2018-09-08 10:55:17 +0200 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2018-09-08 10:55:17 +0200 |
| commit | a14e9cfde83c708791ba6a66b45addbe719c9a1d (patch) | |
| tree | 75bf894365c44e400479cd939cecad92e2c6b38d /lib/api | |
| parent | ec54fd36e991b2c19b4e4d07342a6f3a1de2d8b1 (diff) | |
| download | gitlab-ce-a14e9cfde83c708791ba6a66b45addbe719c9a1d.tar.gz | |
API: Use find_branch! in all places
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/branches.rb | 8 | ||||
| -rw-r--r-- | lib/api/commits.rb | 5 | ||||
| -rw-r--r-- | lib/api/helpers.rb | 8 |
3 files changed, 10 insertions, 11 deletions
diff --git a/lib/api/branches.rb b/lib/api/branches.rb index 3e445e6b1fa..6c1d445e53d 100644 --- a/lib/api/branches.rb +++ b/lib/api/branches.rb @@ -9,14 +9,6 @@ module API before { authorize! :download_code, user_project } helpers do - def find_branch!(branch_name) - begin - user_project.repository.find_branch(branch_name) || not_found!('Branch') - rescue Gitlab::Git::CommandError - render_api_error!('The branch refname is invalid', 400) - end - end - params :filter_params do optional :search, type: String, desc: 'Return list of branches matching the search criteria' optional :sort, type: String, desc: 'Return list of branches sorted by the given field' diff --git a/lib/api/commits.rb b/lib/api/commits.rb index 92329465b2c..3e8de3c8dae 100644 --- a/lib/api/commits.rb +++ b/lib/api/commits.rb @@ -159,8 +159,7 @@ module API commit = user_project.commit(params[:sha]) not_found!('Commit') unless commit - branch = user_project.repository.find_branch(params[:branch]) - not_found!('Branch') unless branch + find_branch!(params[:branch]) commit_params = { commit: commit, @@ -171,7 +170,7 @@ module API result = ::Commits::CherryPickService.new(user_project, current_user, commit_params).execute if result[:status] == :success - branch = user_project.repository.find_branch(params[:branch]) + branch = find_branch!(params[:branch]) present user_project.repository.commit(branch.dereferenced_target), with: Entities::Commit else render_api_error!(result[:message], 400) diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index be17653dbb2..3469fffc1c8 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -156,6 +156,14 @@ module API end end + def find_branch!(branch_name) + begin + user_project.repository.find_branch(branch_name) || not_found!('Branch') + rescue Gitlab::Git::CommandError + render_api_error!('The branch refname is invalid', 400) + end + end + def find_project_label(id) labels = available_labels_for(user_project) label = labels.find_by_id(id) || labels.find_by_title(id) |