kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Incorporate feedback

Browse source
This commit is contained in:
Robert Schilling 2018-02-09 14:30:27 +01:00
parent 2bbf75f211
commit 4cefb568d9
2 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lib/api/commits.rb
View file

@ -156,29 +156,30 @@ module API
end end
end end
desc 'Get all reference a commit is pushed to' do desc 'Get all references a commit is pushed to' do
detail 'This feature was introduced in GitLab 10.6' detail 'This feature was introduced in GitLab 10.6'
success Entities::SimpleRef success Entities::BasicRef
end end
params do params do
requires :sha, type: String, desc: 'A commit sha' requires :sha, type: String, desc: 'A commit sha'
optional :type, type: String, values: %w(branches tags all), default: 'all', desc: 'Scope' optional :type, type: String, values: %w[branches tags all], default: 'all', desc: 'Scope'
end end
get ':id/repository/commits/:sha/refs', requirements: API::COMMIT_ENDPOINT_REQUIREMENTS do get ':id/repository/commits/:sha/refs', requirements: API::COMMIT_ENDPOINT_REQUIREMENTS do
commit = user_project.commit(params[:sha]) commit = user_project.commit(params[:sha])
not_found!('Commit') unless commit not_found!('Commit') unless commit
case params[:type] refs =
when 'branches' case params[:type]
refs = user_project.repository.branch_names_contains(commit.id) when 'branches'
when 'tags' user_project.repository.branch_names_contains(commit.id)
refs = user_project.repository.tag_names_contains(commit.id) when 'tags'
else user_project.repository.tag_names_contains(commit.id)
refs = user_project.repository.branch_names_contains(commit.id) else
refs.push(*user_project.repository.tag_names_contains(commit.id)) refs = user_project.repository.branch_names_contains(commit.id)
end refs.concat(user_project.repository.tag_names_contains(commit.id))
end
present refs, with: Entities::SimpleRef present refs, with: Entities::BasicRef
end end
desc 'Post comment to commit' do desc 'Post comment to commit' do
@ -190,7 +191,7 @@ module API
optional :path, type: String, desc: 'The file path' optional :path, type: String, desc: 'The file path'
given :path do given :path do
requires :line, type: Integer, desc: 'The line number' requires :line, type: Integer, desc: 'The line number'
requires :line_type, type: String, values: %w(new old), default: 'new', desc: 'The type of the line' requires :line_type, type: String, values: %w[new old], default: 'new', desc: 'The type of the line'
end end
end end
post ':id/repository/commits/:sha/comments', requirements: API::COMMIT_ENDPOINT_REQUIREMENTS do post ':id/repository/commits/:sha/comments', requirements: API::COMMIT_ENDPOINT_REQUIREMENTS do

10
lib/api/entities.rb
View file

@ -277,16 +277,12 @@ module API
end end
class BasicRef < Grape::Entity class BasicRef < Grape::Entity
expose :name
end
class SimpleRef < Grape::Entity
expose :name do |ref, options| expose :name do |ref, options|
ref ref
end end
end end
class Branch < BasicRef class Branch < Grape::Entity
expose :name expose :name
expose :commit, using: Entities::Commit do |repo_branch, options| expose :commit, using: Entities::Commit do |repo_branch, options|
@ -855,8 +851,8 @@ module API
expose :description expose :description
end end
class Tag < BasicRef class Tag < Grape::Entity
expose :message expose :name, :message
expose :commit, using: Entities::Commit do |repo_tag, options| expose :commit, using: Entities::Commit do |repo_tag, options|
options[:project].repository.commit(repo_tag.dereferenced_target) options[:project].repository.commit(repo_tag.dereferenced_target)