blob: ee296258d0413df63689315701665c68b5756c9e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
|
- page_title _("Merge Conflicts"), "#{@merge_request.title} (#{@merge_request.to_reference}", _("Merge requests")
- add_page_specific_style 'page_bundles/merge_conflicts'
= render "projects/merge_requests/mr_title"
.merge-request-details.issuable-details
= render "projects/merge_requests/mr_box"
= render 'shared/issuable/sidebar', issuable_sidebar: @issuable_sidebar, assignees: @merge_request.assignees, source_branch: @merge_request.source_branch
#conflicts{ data: { conflicts_path: conflicts_project_merge_request_path(@merge_request.project, @merge_request, format: :json),
resolve_conflicts_path: resolve_conflicts_project_merge_request_path(@merge_request.project, @merge_request),
source_branch_path: project_tree_path(@merge_request.project, @merge_request.source_branch),
merge_request_path: project_merge_request_path(@merge_request.project, @merge_request) } }
|
