diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-05-15 10:57:41 -0700 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-05-21 11:36:54 -0700 |
| commit | fd2e1290e679d89e934acf560deea58967c5adb2 (patch) | |
| tree | 2dc4d86ed3d952e2d211694e1331a12399702321 /app | |
| parent | 6f91ceecef9433b94859644096a1962d61964128 (diff) | |
| download | gitlab-ce-fd2e1290e679d89e934acf560deea58967c5adb2.tar.gz | |
Update copy; add monospace font to branch names
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/_commit_stats.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/_submit_form.html.haml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/views/projects/merge_requests/conflicts/_commit_stats.html.haml b/app/views/projects/merge_requests/conflicts/_commit_stats.html.haml index 964dc40a213..e6205f24ae6 100644 --- a/app/views/projects/merge_requests/conflicts/_commit_stats.html.haml +++ b/app/views/projects/merge_requests/conflicts/_commit_stats.html.haml @@ -11,6 +11,6 @@ Showing %strong.cred {{conflictsCountText}} between - %strong {{conflictsData.sourceBranch}} + %strong.ref-name {{conflictsData.sourceBranch}} and - %strong {{conflictsData.targetBranch}} + %strong.ref-name {{conflictsData.targetBranch}} diff --git a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml index baec6963ec8..6af07c8998c 100644 --- a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml +++ b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml @@ -4,12 +4,12 @@ .col-md-4 %h4 Resolve conflicts on source branch .resolve-info - Resolve the merge conflict by choosing + You can resolve the merge conflict using either the Interactive mode, by choosing %code Use ours or %code Use theirs - in all the conflicted files above. Commit these changes into - #{link_to @merge_request.source_branch, project_tree_path(@merge_request.project, @merge_request.source_branch)}. + buttons, or by editing the files directly. Commit these changes into + #{link_to @merge_request.source_branch, project_tree_path(@merge_request.project, @merge_request.source_branch), class: "ref-name"}. .col-md-8 %label.label-light{ "for" => "commit-message" } #{ _('Commit message') } |