From 10ee137e9c13271d49d7046723b1e473d62a578f Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 27 May 2014 11:16:50 +0300 Subject: Expose timeout and same_ref compare fields Signed-off-by: Dmitriy Zaporozhets --- lib/api/entities.rb | 6 ++++++ lib/api/repositories.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'lib/api') diff --git a/lib/api/entities.rb b/lib/api/entities.rb index eead8b18ebd..4a9220a7f49 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -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 diff --git a/lib/api/repositories.rb b/lib/api/repositories.rb index d59c25cf316..a587d4a7bdf 100644 --- a/lib/api/repositories.rb +++ b/lib/api/repositories.rb @@ -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 -- cgit v1.2.1