diff options
author | Oleg Zubchenko <RedGreenBlueDiamond@gmail.com> | 2019-07-04 14:59:10 +0300 |
---|---|---|
committer | Oleg Zubchenko <RedGreenBlueDiamond@gmail.com> | 2019-07-26 19:27:32 +0300 |
commit | 5a8eaef42e771e9de6f6cbce715877352807f53c (patch) | |
tree | 4e59b9875e53217f8e66f67693a7d9b80446bd11 /lib/api | |
parent | 21c372827eb0b536d667dd2ae16e5a4930db6300 (diff) | |
download | gitlab-ce-5a8eaef42e771e9de6f6cbce715877352807f53c.tar.gz |
Add git blame api
Diffstat (limited to 'lib/api')
-rw-r--r-- | lib/api/entities.rb | 13 | ||||
-rw-r--r-- | lib/api/files.rb | 25 |
2 files changed, 38 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 0a9515f1dd2..2b1176871fe 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -2,6 +2,19 @@ module API module Entities + class BlameRangeCommit < Grape::Entity + expose :id + expose :parent_ids + expose :message + expose :authored_date, :author_name, :author_email + expose :committed_date, :committer_name, :committer_email + end + + class BlameRange < Grape::Entity + expose :commit, using: BlameRangeCommit + expose :lines + end + class WikiPageBasic < Grape::Entity expose :format expose :slug diff --git a/lib/api/files.rb b/lib/api/files.rb index ca59d330e1c..0b438fb5bbc 100644 --- a/lib/api/files.rb +++ b/lib/api/files.rb @@ -83,6 +83,31 @@ module API resource :projects, requirements: FILE_ENDPOINT_REQUIREMENTS do allow_access_with_scope :read_repository, if: -> (request) { request.get? || request.head? } + desc 'Get blame file metadata from repository' + params do + requires :file_path, type: String, desc: 'The url encoded path to the file. Ex. lib%2Fclass%2Erb' + requires :ref, type: String, desc: 'The name of branch, tag or commit', allow_blank: false + end + head ":id/repository/files/:file_path/blame", requirements: FILE_ENDPOINT_REQUIREMENTS do + assign_file_vars! + + set_http_headers(blob_data) + end + + desc 'Get blame file from the repository' + params do + requires :file_path, type: String, desc: 'The url encoded path to the file. Ex. lib%2Fclass%2Erb' + requires :ref, type: String, desc: 'The name of branch, tag or commit', allow_blank: false + end + get ":id/repository/files/:file_path/blame", requirements: FILE_ENDPOINT_REQUIREMENTS do + assign_file_vars! + + set_http_headers(blob_data) + + blame_ranges = Gitlab::Blame.new(@blob, @commit).groups(highlight: false) + present blame_ranges, with: Entities::BlameRange + end + desc 'Get raw file metadata from repository' params do requires :file_path, type: String, desc: 'The url encoded path to the file. Ex. lib%2Fclass%2Erb' |