2a9eed6620
Conflicts: app/views/projects/commits/_commit.html.haml app/views/projects/issues/_issue.html.haml app/views/projects/issues/_issue_context.html.haml app/views/projects/merge_requests/_merge_request.html.haml app/views/projects/merge_requests/show/_context.html.haml
31 lines
697 B
Ruby
31 lines
697 B
Ruby
class Projects::CompareController < Projects::ApplicationController
|
|
# Authorize
|
|
before_filter :require_non_empty_project
|
|
before_filter :authorize_download_code!
|
|
|
|
def index
|
|
end
|
|
|
|
def show
|
|
base_ref = params[:from]
|
|
head_ref = params[:to]
|
|
|
|
compare_result = CompareService.new.execute(
|
|
current_user,
|
|
@project,
|
|
head_ref,
|
|
@project,
|
|
base_ref
|
|
)
|
|
|
|
@commits = compare_result.commits
|
|
@diffs = compare_result.diffs
|
|
@commit = @commits.last
|
|
@line_notes = []
|
|
end
|
|
|
|
def create
|
|
redirect_to namespace_project_compare_path(@project.namespace, @project,
|
|
params[:from], params[:to])
|
|
end
|
|
end
|