2011-11-28 02:39:43 -05:00
|
|
|
module MergeRequestsHelper
|
2015-11-17 12:53:56 -05:00
|
|
|
def new_mr_path_from_push_event(event)
|
2017-04-26 18:04:07 -04:00
|
|
|
target_project = event.project.default_merge_request_target
|
2017-06-29 13:06:35 -04:00
|
|
|
project_new_merge_request_path(
|
2015-11-17 12:53:56 -05:00
|
|
|
event.project,
|
|
|
|
new_mr_from_push_event(event, target_project)
|
|
|
|
)
|
|
|
|
end
|
|
|
|
|
|
|
|
def new_mr_from_push_event(event, target_project)
|
|
|
|
{
|
|
|
|
merge_request: {
|
|
|
|
source_project_id: event.project.id,
|
|
|
|
target_project_id: target_project.id,
|
|
|
|
source_branch: event.branch_name,
|
|
|
|
target_branch: target_project.repository.root_ref
|
|
|
|
}
|
|
|
|
}
|
|
|
|
end
|
|
|
|
|
2014-09-25 18:07:40 -04:00
|
|
|
def mr_css_classes(mr)
|
2013-04-06 08:10:24 -04:00
|
|
|
classes = "merge-request"
|
2013-02-18 03:40:56 -05:00
|
|
|
classes << " closed" if mr.closed?
|
2012-06-21 01:29:53 -04:00
|
|
|
classes << " merged" if mr.merged?
|
|
|
|
classes
|
|
|
|
end
|
2012-11-20 12:34:05 -05:00
|
|
|
|
2014-09-25 18:07:40 -04:00
|
|
|
def ci_build_details_path(merge_request)
|
2016-06-20 12:48:04 -04:00
|
|
|
build_url = merge_request.source_project.ci_service.build_page(merge_request.diff_head_sha, merge_request.source_branch)
|
2015-12-21 18:20:32 -05:00
|
|
|
return nil unless build_url
|
|
|
|
|
2014-06-10 15:21:28 -04:00
|
|
|
parsed_url = URI.parse(build_url)
|
|
|
|
|
|
|
|
unless parsed_url.userinfo.blank?
|
|
|
|
parsed_url.userinfo = ''
|
|
|
|
end
|
|
|
|
|
|
|
|
parsed_url.to_s
|
2012-11-20 12:34:05 -05:00
|
|
|
end
|
2013-07-17 10:35:11 -04:00
|
|
|
|
|
|
|
def merge_path_description(merge_request, separator)
|
|
|
|
if merge_request.for_fork?
|
2017-07-20 05:34:09 -04:00
|
|
|
"Project:Branches: #{@merge_request.source_project_path}:#{@merge_request.source_branch} #{separator} #{@merge_request.target_project.full_path}:#{@merge_request.target_branch}"
|
2013-07-17 10:35:11 -04:00
|
|
|
else
|
|
|
|
"Branches: #{@merge_request.source_branch} #{separator} #{@merge_request.target_branch}"
|
|
|
|
end
|
|
|
|
end
|
2014-06-13 08:38:10 -04:00
|
|
|
|
2015-05-06 08:13:11 -04:00
|
|
|
def mr_change_branches_path(merge_request)
|
2017-06-29 13:06:35 -04:00
|
|
|
project_new_merge_request_path(
|
|
|
|
@project,
|
2015-05-06 08:13:11 -04:00
|
|
|
merge_request: {
|
2017-02-14 08:43:12 -05:00
|
|
|
source_project_id: merge_request.source_project_id,
|
|
|
|
target_project_id: merge_request.target_project_id,
|
|
|
|
source_branch: merge_request.source_branch,
|
2017-05-03 07:22:03 -04:00
|
|
|
target_branch: merge_request.target_branch
|
2015-12-02 08:22:33 -05:00
|
|
|
},
|
|
|
|
change_branches: true
|
2015-05-06 08:13:11 -04:00
|
|
|
)
|
|
|
|
end
|
2015-08-07 10:04:17 -04:00
|
|
|
|
2015-09-30 23:50:53 -04:00
|
|
|
def format_mr_branch_names(merge_request)
|
|
|
|
source_path = merge_request.source_project_path
|
|
|
|
target_path = merge_request.target_project_path
|
|
|
|
source_branch = merge_request.source_branch
|
|
|
|
target_branch = merge_request.target_branch
|
|
|
|
|
|
|
|
if source_path == target_path
|
|
|
|
[source_branch, target_branch]
|
|
|
|
else
|
|
|
|
["#{source_path}:#{source_branch}", "#{target_path}:#{target_branch}"]
|
|
|
|
end
|
|
|
|
end
|
2016-07-11 03:51:18 -04:00
|
|
|
|
2017-04-26 18:04:07 -04:00
|
|
|
def target_projects(project)
|
2017-09-20 11:41:11 -04:00
|
|
|
MergeRequestTargetProjectFinder.new(current_user: current_user, source_project: project)
|
|
|
|
.execute
|
2017-04-26 18:04:07 -04:00
|
|
|
end
|
|
|
|
|
2016-07-11 03:51:18 -04:00
|
|
|
def merge_request_button_visibility(merge_request, closed)
|
2016-07-26 07:57:43 -04:00
|
|
|
return 'hidden' if merge_request.closed? == closed || (merge_request.merged? == closed && !merge_request.closed?) || merge_request.closed_without_fork?
|
2016-07-11 03:51:18 -04:00
|
|
|
end
|
2016-08-31 09:30:54 -04:00
|
|
|
|
2016-09-06 11:35:27 -04:00
|
|
|
def merge_request_version_path(project, merge_request, merge_request_diff, start_sha = nil)
|
2017-06-29 13:06:35 -04:00
|
|
|
diffs_project_merge_request_path(project, merge_request, diff_id: merge_request_diff.id, start_sha: start_sha)
|
2016-08-31 09:30:54 -04:00
|
|
|
end
|
2016-09-06 13:08:06 -04:00
|
|
|
|
|
|
|
def version_index(merge_request_diff)
|
2018-06-21 08:22:40 -04:00
|
|
|
return nil if @merge_request_diffs.empty?
|
|
|
|
|
2016-09-06 13:08:06 -04:00
|
|
|
@merge_request_diffs.size - @merge_request_diffs.index(merge_request_diff)
|
|
|
|
end
|
2016-10-12 10:42:32 -04:00
|
|
|
|
|
|
|
def different_base?(version1, version2)
|
|
|
|
version1 && version2 && version1.base_commit_sha != version2.base_commit_sha
|
|
|
|
end
|
2017-02-01 09:28:04 -05:00
|
|
|
|
|
|
|
def merge_params(merge_request)
|
|
|
|
{
|
2017-02-17 08:56:13 -05:00
|
|
|
merge_when_pipeline_succeeds: true,
|
2017-02-01 09:28:04 -05:00
|
|
|
should_remove_source_branch: true,
|
2018-05-29 05:51:43 -04:00
|
|
|
sha: merge_request.diff_head_sha,
|
|
|
|
squash: merge_request.squash
|
|
|
|
}
|
2017-02-01 09:28:04 -05:00
|
|
|
end
|
|
|
|
|
2017-12-01 14:08:30 -05:00
|
|
|
def tab_link_for(merge_request, tab, options = {}, &block)
|
2017-11-08 15:39:29 -05:00
|
|
|
data_attrs = {
|
|
|
|
action: tab.to_s,
|
2017-12-01 14:08:30 -05:00
|
|
|
target: "##{tab}",
|
2018-06-30 09:17:46 -04:00
|
|
|
toggle: options.fetch(:force_link, false) ? '' : 'tabvue'
|
2017-11-08 15:39:29 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
url = case tab
|
2017-12-01 14:08:30 -05:00
|
|
|
when :show
|
|
|
|
data_attrs[:target] = '#notes'
|
|
|
|
method(:project_merge_request_path)
|
|
|
|
when :commits
|
|
|
|
method(:commits_project_merge_request_path)
|
|
|
|
when :pipelines
|
|
|
|
method(:pipelines_project_merge_request_path)
|
|
|
|
when :diffs
|
|
|
|
method(:diffs_project_merge_request_path)
|
|
|
|
else
|
|
|
|
raise "Cannot create tab #{tab}."
|
|
|
|
end
|
|
|
|
|
|
|
|
link_to(url[merge_request.project, merge_request], data: data_attrs, &block)
|
2017-11-08 15:39:29 -05:00
|
|
|
end
|
|
|
|
|
2018-05-22 21:54:57 -04:00
|
|
|
def allow_collaboration_unavailable_reason(merge_request)
|
|
|
|
return if merge_request.can_allow_collaboration?(current_user)
|
2018-02-23 12:30:37 -05:00
|
|
|
|
|
|
|
minimum_visibility = [merge_request.target_project.visibility_level,
|
|
|
|
merge_request.source_project.visibility_level].min
|
|
|
|
|
|
|
|
if minimum_visibility < Gitlab::VisibilityLevel::INTERNAL
|
|
|
|
_('Not available for private projects')
|
|
|
|
elsif ProtectedBranch.protected?(merge_request.source_project, merge_request.source_branch)
|
|
|
|
_('Not available for protected branches')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2018-04-06 10:04:48 -04:00
|
|
|
def merge_request_source_project_for_project(project = @project)
|
|
|
|
unless can?(current_user, :create_merge_request_in, project)
|
|
|
|
return nil
|
|
|
|
end
|
|
|
|
|
|
|
|
if can?(current_user, :create_merge_request_from, project)
|
|
|
|
project
|
|
|
|
else
|
|
|
|
current_user.fork_of(project)
|
|
|
|
end
|
|
|
|
end
|
2011-11-28 02:39:43 -05:00
|
|
|
end
|