kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Update copy; add monospace font to branch names

This commit is contained in:
Annabel Dunstone Gray 2018-05-15 10:57:41 -07:00
parent 6f91ceecef
commit fd2e1290e6
No known key found for this signature in database
GPG Key ID: 7C8C78A372AD7A2D
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/projects/merge_requests/conflicts/_commit_stats.html.haml
View File

@ -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}}

6
app/views/projects/merge_requests/conflicts/_submit_form.html.haml
View File

@ -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') }