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
11fb90ad
Commit
11fb90ad
authored
Jan 11, 2022
by
PaytonBurdette
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add anchor to link
parent
e795349c
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_request_merge_method_settings.html.haml
...s/projects/_merge_request_merge_method_settings.html.haml
+1
-1
No files found.
app/views/projects/_merge_request_merge_method_settings.html.haml
View file @
11fb90ad
...
@@ -33,4 +33,4 @@
...
@@ -33,4 +33,4 @@
=
s_
(
'ProjectSettings|When there is a merge conflict, the user is given the option to rebase.'
)
=
s_
(
'ProjectSettings|When there is a merge conflict, the user is given the option to rebase.'
)
%div
%div
=
s_
(
'ProjectSettings|If merge trains are enabled, merging is only possible if the branch can be rebased without conflicts.'
)
=
s_
(
'ProjectSettings|If merge trains are enabled, merging is only possible if the branch can be rebased without conflicts.'
)
=
link_to
sprite_icon
(
'question-o'
),
help_page_path
(
'ci/pipelines/merge_trains.md'
),
target:
'_blank'
,
rel:
'noopener noreferrer'
=
link_to
sprite_icon
(
'question-o'
),
help_page_path
(
'ci/pipelines/merge_trains.md'
,
anchor:
'enable-merge-trains'
),
target:
'_blank'
,
rel:
'noopener noreferrer'
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