2015-04-27 02:42:29 -04:00
|
|
|
require 'addressable/uri'
|
|
|
|
|
2013-06-23 12:47:22 -04:00
|
|
|
class Projects::CompareController < Projects::ApplicationController
|
2016-07-06 13:15:27 -04:00
|
|
|
include DiffForPath
|
2016-03-03 12:38:44 -05:00
|
|
|
include DiffHelper
|
|
|
|
|
2012-09-20 15:20:48 -04:00
|
|
|
# Authorize
|
2015-04-16 08:03:37 -04:00
|
|
|
before_action :require_non_empty_project
|
|
|
|
before_action :authorize_download_code!
|
2016-07-06 13:15:27 -04:00
|
|
|
before_action :define_ref_vars, only: [:index, :show, :diff_for_path]
|
|
|
|
before_action :define_diff_vars, only: [:show, :diff_for_path]
|
2016-02-01 18:43:51 -05:00
|
|
|
before_action :merge_request, only: [:index, :show]
|
2012-09-20 15:20:48 -04:00
|
|
|
|
2012-09-25 23:10:50 -04:00
|
|
|
def index
|
|
|
|
end
|
|
|
|
|
2012-09-20 15:20:48 -04:00
|
|
|
def show
|
2016-07-07 07:36:33 -04:00
|
|
|
apply_diff_view_cookie!
|
2012-09-20 15:20:48 -04:00
|
|
|
end
|
2012-09-25 23:10:50 -04:00
|
|
|
|
2016-06-28 12:25:32 -04:00
|
|
|
def diff_for_path
|
2016-07-06 13:15:27 -04:00
|
|
|
return render_404 unless @compare
|
2016-06-28 12:25:32 -04:00
|
|
|
|
2016-08-03 12:32:01 -04:00
|
|
|
render_diff_for_path(@compare.diffs(diff_options))
|
2016-06-28 12:25:32 -04:00
|
|
|
end
|
|
|
|
|
2012-09-25 23:10:50 -04:00
|
|
|
def create
|
2017-01-10 17:11:36 -05:00
|
|
|
if params[:from].blank? || params[:to].blank?
|
2017-01-14 19:12:19 -05:00
|
|
|
flash[:alert] = "You must select from and to branches"
|
2017-01-16 14:23:30 -05:00
|
|
|
from_to_vars = {
|
|
|
|
from: params[:from].presence,
|
|
|
|
to: params[:to].presence
|
|
|
|
}
|
|
|
|
redirect_to namespace_project_compare_index_path(@project.namespace, @project, from_to_vars)
|
2017-01-10 17:11:36 -05:00
|
|
|
else
|
|
|
|
redirect_to namespace_project_compare_path(@project.namespace, @project,
|
2015-01-24 13:02:58 -05:00
|
|
|
params[:from], params[:to])
|
2017-01-10 17:11:36 -05:00
|
|
|
end
|
2012-09-25 23:10:50 -04:00
|
|
|
end
|
2016-02-01 18:43:51 -05:00
|
|
|
|
|
|
|
private
|
|
|
|
|
2016-07-06 13:15:27 -04:00
|
|
|
def define_ref_vars
|
2016-06-20 12:51:48 -04:00
|
|
|
@start_ref = Addressable::URI.unescape(params[:from])
|
2016-02-01 18:43:51 -05:00
|
|
|
@ref = @head_ref = Addressable::URI.unescape(params[:to])
|
|
|
|
end
|
|
|
|
|
2016-07-06 13:15:27 -04:00
|
|
|
def define_diff_vars
|
2017-01-04 09:32:36 -05:00
|
|
|
@compare = CompareService.new(@project, @head_ref)
|
|
|
|
.execute(@project, @start_ref)
|
2016-07-06 13:15:27 -04:00
|
|
|
|
|
|
|
if @compare
|
2016-07-27 07:09:52 -04:00
|
|
|
@commits = @compare.commits
|
|
|
|
@start_commit = @compare.start_commit
|
|
|
|
@commit = @compare.commit
|
|
|
|
@base_commit = @compare.base_commit
|
2016-07-06 13:15:27 -04:00
|
|
|
|
2016-08-03 12:32:01 -04:00
|
|
|
@diffs = @compare.diffs(diff_options)
|
2016-07-06 13:15:27 -04:00
|
|
|
|
2017-02-06 19:06:46 -05:00
|
|
|
environment_params = @repository.branch_exists?(@head_ref) ? { ref: @head_ref } : { commit: @commit }
|
|
|
|
@environment = EnvironmentsFinder.new(@project, current_user, environment_params).execute.last
|
2017-01-29 14:38:00 -05:00
|
|
|
|
2016-07-06 13:15:27 -04:00
|
|
|
@diff_notes_disabled = true
|
2016-07-20 18:18:18 -04:00
|
|
|
@grouped_diff_discussions = {}
|
2016-07-06 13:15:27 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-02-01 18:43:51 -05:00
|
|
|
def merge_request
|
2016-11-29 08:47:43 -05:00
|
|
|
@merge_request ||= MergeRequestsFinder.new(current_user, project_id: @project.id).execute.opened.
|
2016-06-20 12:51:48 -04:00
|
|
|
find_by(source_project: @project, source_branch: @head_ref, target_branch: @start_ref)
|
2016-02-01 18:43:51 -05:00
|
|
|
end
|
2012-09-20 15:20:48 -04:00
|
|
|
end
|