46 lines
1.3 KiB
Ruby
46 lines
1.3 KiB
Ruby
require 'addressable/uri'
|
|
|
|
class Projects::CompareController < Projects::ApplicationController
|
|
include DiffHelper
|
|
|
|
# Authorize
|
|
before_action :require_non_empty_project
|
|
before_action :authorize_download_code!
|
|
before_action :assign_ref_vars, only: [:index, :show]
|
|
before_action :merge_request, only: [:index, :show]
|
|
|
|
def index
|
|
end
|
|
|
|
def show
|
|
compare = CompareService.new.
|
|
execute(@project, @head_ref, @project, @base_ref, diff_options)
|
|
|
|
if compare
|
|
@commits = Commit.decorate(compare.commits, @project)
|
|
@commit = @project.commit(@head_ref)
|
|
@base_commit = @project.merge_base_commit(@base_ref, @head_ref)
|
|
@diffs = compare.diffs(diff_options)
|
|
@diff_refs = [@base_commit, @commit]
|
|
@line_notes = []
|
|
end
|
|
end
|
|
|
|
def create
|
|
redirect_to namespace_project_compare_path(@project.namespace, @project,
|
|
params[:from], params[:to])
|
|
end
|
|
|
|
private
|
|
|
|
def assign_ref_vars
|
|
@base_ref = Addressable::URI.unescape(params[:from])
|
|
@ref = @head_ref = Addressable::URI.unescape(params[:to])
|
|
end
|
|
|
|
def merge_request
|
|
@merge_request ||= @project.merge_requests.opened.
|
|
find_by(source_project: @project, source_branch: @head_ref, target_branch: @base_ref)
|
|
end
|
|
end
|