Unverified Commit 2f780af2 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Git::Compare does not have limit param any more


Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent a716ea03c0d3
......@@ -12,7 +12,6 @@ def execute(current_user, source_project, source_branch, target_project, target_
target_project.repository.raw_repository,
target_branch,
source_branch,
10000
)
)
else
......
......@@ -13,7 +13,7 @@ def perform(project_id, recipients, push_data)
return true
end
compare = Gitlab::Git::Compare.new(project.repository.raw_repository, before_sha, after_sha, MergeRequestDiff::COMMITS_SAFE_SIZE)
compare = Gitlab::Git::Compare.new(project.repository.raw_repository, before_sha, after_sha)
# Do not send emails if git compare failed
return false unless compare && compare.commits.present?
......
......@@ -201,13 +201,13 @@ class RepoDiff < Grape::Entity
class Compare < Grape::Entity
expose :commit, using: Entities::RepoCommit do |compare, options|
if compare.commit
Commit.new compare.commit
end
Commit.decorate(compare.commits).last
end
expose :commits, using: Entities::RepoCommit do |compare, options|
Commit.decorate compare.commits
Commit.decorate(compare.commits)
end
expose :diffs, using: Entities::RepoDiff do |compare, options|
compare.diffs
end
......
......@@ -147,7 +147,7 @@ def handle_project_member_errors(errors)
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)
compare = Gitlab::Git::Compare.new(user_project.repository.raw_repository, params[:from], params[:to])
present compare, with: Entities::Compare
end
......
......@@ -33,7 +33,11 @@ def update_satellite_source_and_target!(target_repo)
end
def compare(repo)
@compare ||= Gitlab::Git::Compare.new(Gitlab::Git::Repository.new(repo.path), "origin/#{@target_branch}", "source/#{@source_branch}", 10000)
@compare ||= Gitlab::Git::Compare.new(
Gitlab::Git::Repository.new(repo.path),
"origin/#{@target_branch}",
"source/#{@source_branch}"
)
end
end
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment