2020-07-28 23:09:34 +05:30
|
|
|
- page_title _("Merge Conflicts"), "#{@merge_request.title} (#{@merge_request.to_reference}", _("Merge Requests")
|
2021-01-03 14:25:43 +05:30
|
|
|
- add_page_specific_style 'page_bundles/merge_conflicts'
|
2017-09-10 17:25:29 +05:30
|
|
|
= render "projects/merge_requests/mr_title"
|
|
|
|
|
|
|
|
|
|
.merge-request-details.issuable-details
|
|
|
|
|
= render "projects/merge_requests/mr_box"
|
|
|
|
|
|
2020-11-24 15:15:51 +05:30
|
|
|
= render 'shared/issuable/sidebar', issuable_sidebar: @issuable_sidebar, assignees: @merge_request.assignees, source_branch: @merge_request.source_branch
|
2017-09-10 17:25:29 +05:30
|
|
|
|
|
|
|
|
#conflicts{ "v-cloak" => "true", 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) } }
|
|
|
|
|
.loading{ "v-if" => "isLoading" }
|
2020-03-13 15:44:24 +05:30
|
|
|
.spinner.spinner-md
|
2017-09-10 17:25:29 +05:30
|
|
|
|
|
|
|
|
.nothing-here-block{ "v-if" => "hasError" }
|
|
|
|
|
{{conflictsData.errorMessage}}
|
|
|
|
|
|
|
|
|
|
= render partial: "projects/merge_requests/conflicts/commit_stats"
|
|
|
|
|
|
|
|
|
|
.files-wrapper{ "v-if" => "!isLoading && !hasError" }
|
|
|
|
|
.files
|
|
|
|
|
.diff-file.file-holder.conflict{ "v-for" => "file in conflictsData.files" }
|
2021-02-22 17:27:13 +05:30
|
|
|
.js-file-title.file-title.file-title-flex-parent.cursor-default
|
|
|
|
|
.file-header-content
|
|
|
|
|
%file-icon{ ':file-name': 'file.filePath', ':size': '18', 'css-classes': 'gl-mr-2' }
|
|
|
|
|
%strong.file-title-name {{file.filePath}}
|
2017-09-10 17:25:29 +05:30
|
|
|
= render partial: 'projects/merge_requests/conflicts/file_actions'
|
|
|
|
|
.diff-content.diff-wrap-lines
|
2019-07-07 11:18:12 +05:30
|
|
|
.file-content{ "v-show" => "!isParallel && file.resolveMode === 'interactive' && file.type === 'text'" }
|
2017-09-10 17:25:29 +05:30
|
|
|
= render partial: "projects/merge_requests/conflicts/components/inline_conflict_lines"
|
2019-07-07 11:18:12 +05:30
|
|
|
.file-content{ "v-show" => "isParallel && file.resolveMode === 'interactive' && file.type === 'text'" }
|
2017-09-10 17:25:29 +05:30
|
|
|
%parallel-conflict-lines{ ":file" => "file" }
|
|
|
|
|
%div{ "v-show" => "file.resolveMode === 'edit' || file.type === 'text-editor'" }
|
|
|
|
|
= render partial: "projects/merge_requests/conflicts/components/diff_file_editor"
|
|
|
|
|
|
|
|
|
|
= render partial: "projects/merge_requests/conflicts/submit_form"
|
