Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6f91ceec
Commit
6f91ceec
authored
May 14, 2018
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make source branch a link
parent
9c302285
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/views/projects/merge_requests/conflicts/_submit_form.html.haml
.../projects/merge_requests/conflicts/_submit_form.html.haml
+1
-1
No files found.
app/views/projects/merge_requests/conflicts/_submit_form.html.haml
View file @
6f91ceec
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
or
or
%code
Use theirs
%code
Use theirs
in all the conflicted files above. Commit these changes into
in all the conflicted files above. Commit these changes into
%strong
{{conflictsData.sourceBranch}
}.
#{
link_to
@merge_request
.
source_branch
,
project_tree_path
(
@merge_request
.
project
,
@merge_request
.
source_branch
)
}
.
.col-md-8
.col-md-8
%label
.label-light
{
"for"
=>
"commit-message"
}
%label
.label-light
{
"for"
=>
"commit-message"
}
#{
_
(
'Commit message'
)
}
#{
_
(
'Commit message'
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment