diff options
Diffstat (limited to 'app/views/projects/_merge_request_merge_method_settings.html.haml')
| -rw-r--r-- | app/views/projects/_merge_request_merge_method_settings.html.haml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/projects/_merge_request_merge_method_settings.html.haml b/app/views/projects/_merge_request_merge_method_settings.html.haml index 2d18285ba80..b0e3bda2b4f 100644 --- a/app/views/projects/_merge_request_merge_method_settings.html.haml +++ b/app/views/projects/_merge_request_merge_method_settings.html.haml @@ -31,3 +31,6 @@ = s_('ProjectSettings|Fast-forward merges only.') %br = s_('ProjectSettings|When there is a merge conflict, the user is given the option to rebase.') + %div + = 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', anchor: 'enable-merge-trains'), target: '_blank', rel: 'noopener noreferrer' |