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)
|
|
|
|
target_project = event.project.forked_from_project || event.project
|
|
|
|
new_namespace_project_merge_request_path(
|
|
|
|
event.project.namespace,
|
|
|
|
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)
|
2014-06-10 15:21:28 -04:00
|
|
|
build_url = merge_request.source_project.ci_service.build_page(merge_request.last_commit.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?
|
2013-12-12 04:52:10 -05:00
|
|
|
"Project:Branches: #{@merge_request.source_project_path}:#{@merge_request.source_branch} #{separator} #{@merge_request.target_project.path_with_namespace}:#{@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
|
|
|
|
|
|
|
def issues_sentence(issues)
|
2015-11-30 15:09:36 -05:00
|
|
|
# Sorting based on the `#123` or `group/project#123` reference will sort
|
|
|
|
# local issues first.
|
|
|
|
issues.map do |issue|
|
|
|
|
issue.to_reference(@project)
|
|
|
|
end.sort.to_sentence
|
2014-06-13 08:38:10 -04:00
|
|
|
end
|
2015-05-06 08:13:11 -04:00
|
|
|
|
|
|
|
def mr_change_branches_path(merge_request)
|
|
|
|
new_namespace_project_merge_request_path(
|
|
|
|
@project.namespace, @project,
|
|
|
|
merge_request: {
|
|
|
|
source_project_id: @merge_request.source_project_id,
|
|
|
|
target_project_id: @merge_request.target_project_id,
|
|
|
|
source_branch: @merge_request.source_branch,
|
2015-12-02 08:22:33 -05:00
|
|
|
target_branch: @merge_request.target_branch,
|
|
|
|
},
|
|
|
|
change_branches: true
|
2015-05-06 08:13:11 -04:00
|
|
|
)
|
|
|
|
end
|
2015-08-07 10:04:17 -04:00
|
|
|
|
|
|
|
def source_branch_with_namespace(merge_request)
|
2015-12-02 11:30:50 -05:00
|
|
|
branch = link_to(merge_request.source_branch, namespace_project_commits_path(merge_request.source_project.namespace, merge_request.source_project, merge_request.source_branch))
|
|
|
|
|
2015-08-07 10:04:17 -04:00
|
|
|
if merge_request.for_fork?
|
|
|
|
namespace = link_to(merge_request.source_project_namespace,
|
|
|
|
project_path(merge_request.source_project))
|
2015-12-02 11:30:50 -05:00
|
|
|
namespace + ":" + branch
|
2015-08-07 10:04:17 -04:00
|
|
|
else
|
2015-12-02 11:30:50 -05:00
|
|
|
branch
|
2015-08-07 10:04:17 -04:00
|
|
|
end
|
|
|
|
end
|
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
|
2011-11-28 02:39:43 -05:00
|
|
|
end
|