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

Expose timeout and same_ref compare fields

Browse source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2014-05-27 11:16:50 +03:00
parent 242291850d
commit 10ee137e9c
No known key found for this signature in database
GPG key ID: 627C5F589F467F17
4 changed files with 27 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
doc/api/repositories.md
View file

@ -152,48 +152,35 @@ GET /projects/:id/repository/compare?from=master&to=feature
Response:
```json
{
"commit": {
"id": "72e10ef47e770a95439255b2c49de722e8782106",
"short_id": "72e10ef47e7",
"title": "Add NEWFILE",
"id": "12d65c8dd2b2676fa3ac47d955accc085a37a9c1",
"short_id": "12d65c8dd2b",
"title": "JS fix",
"author_name": "Dmitriy Zaporozhets",
"author_email": "dmitriy.zaporozhets@gmail.com",
"created_at": "2014-05-26T16:03:54+03:00"
"created_at": "2014-02-27T10:27:00+02:00"
},
"commits": [{
"id": "0b4bc9a49b562e85de7cc9e834518ea6828729b9",
"short_id": "0b4bc9a49b5",
"title": "Feature added",
"id": "12d65c8dd2b2676fa3ac47d955accc085a37a9c1",
"short_id": "12d65c8dd2b",
"title": "JS fix",
"author_name": "Dmitriy Zaporozhets",
"author_email": "dmitriy.zaporozhets@gmail.com",
"created_at": "2014-02-27T10:26:01+02:00"
}, {
"id": "72e10ef47e770a95439255b2c49de722e8782106",
"short_id": "72e10ef47e7",
"title": "Add NEWFILE",
"author_name": "Dmitriy Zaporozhets",
"author_email": "dmitriy.zaporozhets@gmail.com",
"created_at": "2014-05-26T16:03:54+03:00"
"created_at": "2014-02-27T10:27:00+02:00"
}],
"diffs": [{
"old_path": "NEWFILE",
"new_path": "NEWFILE",
"old_path": "files/js/application.js",
"new_path": "files/js/application.js",
"a_mode": null,
"b_mode": null,
"diff": "--- /dev/null\n+++ b/NEWFILE\n@@ -0,0 +1 @@\n+This is NEWFILE content\n\\ No newline at end of file",
"new_file": true,
"b_mode": "100644",
"diff": "--- a/files/js/application.js\n+++ b/files/js/application.js\n@@ -24,8 +24,10 @@\n //= require g.raphael-min\n //= require g.bar-min\n //= require branch-graph\n-//= require highlightjs.min\n-//= require ace/ace\n //= require_tree .\n //= require d3\n //= require underscore\n+\n+function fix() { \n+ alert(\"Fixed\")\n+}",
"new_file": false,
"renamed_file": false,
"deleted_file": false
}, {
"old_path": "files/ruby/feature.rb",
"new_path": "files/ruby/feature.rb",
"a_mode": null,
"b_mode": null,
"diff": "--- /dev/null\n+++ b/files/ruby/feature.rb\n@@ -0,0 +1,5 @@\n+class Feature\n+ def foo\n+ puts 'bar'\n+ end\n+end",
"new_file": true,
"renamed_file": false,
"deleted_file": false
}]
}],
"compare_timeout": false,
"compare_same_ref": false
}
```

6
lib/api/entities.rb
View file

@ -210,6 +210,12 @@ module API
expose :diffs, using: Entities::RepoDiff do |compare, options|
compare.diffs
end
expose :compare_timeout do |compare, options|
compare.timeout
end
expose :same, as: :compare_same_ref
end
end
end

2
lib/api/repositories.rb
View file

@ -130,8 +130,8 @@ module API
# GET /projects/:id/repository/compare?from=master&to=feature
get ':id/repository/compare' do
authorize! :download_code, user_project
required_attributes! [:from, :to]
compare = Gitlab::Git::Compare.new(user_project.repository.raw_repository, params[:from], params[:to], MergeRequestDiff::COMMITS_SAFE_SIZE)
present compare, with: Entities::Compare
end
end

3
spec/requests/api/repositories_spec.rb
View file

@ -118,18 +118,21 @@ describe API::API, api: true do
get api("/projects/#{project.id}/repository/compare", user), from: 'master', to: 'simple_merge_request'
response.status.should == 200
json_response['commits'].size.should == 3
json_response['diffs'].size.should == 1
end
it "should compare 2 commits" do
get api("/projects/#{project.id}/repository/compare", user), from: 'b1e6a9dbf1c85', to: '1e689bfba395'
response.status.should == 200
json_response['commits'].size.should == 0
json_response['diffs'].size.should == 0
end
it "should compare 2 commits" do
get api("/projects/#{project.id}/repository/compare", user), from: '1e689bfba395', to: 'b1e6a9dbf1c85'
response.status.should == 200
json_response['commits'].size.should == 4
json_response['diffs'].size.should == 9
end
end
end