Commit 6f34f447 authored by Thomas Randolph's avatar Thomas Randolph

Add documentation links to Merge Request settings page

This also swaps a question mark icon for a short sentence.

Changelog: other
parent 5ce2ff71
......@@ -2,7 +2,9 @@
.form-group
%b= s_('ProjectSettings|Merge method')
%p.text-secondary= s_('ProjectSettings|Determine what happens to the commit history when you merge a merge request.')
%p.text-secondary
= s_('ProjectSettings|Determine what happens to the commit history when you merge a merge request.')
= link_to s_('ProjectSettings|Learn about commit history.'), help_page_path('user/project/merge_requests/commits.md'), target: '_blank', rel: 'noopener noreferrer'
.form-check.mb-2
= form.radio_button :merge_method, :merge, class: "js-merge-method-radio form-check-input"
= label_tag :project_merge_method_merge, class: 'form-check-label' do
......@@ -33,4 +35,4 @@
= 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'
= link_to s_('ProjectSettings|What are merge trains?'), help_page_path('ci/pipelines/merge_trains.md', anchor: 'enable-merge-trains'), target: '_blank', rel: 'noopener noreferrer'
......@@ -28318,6 +28318,9 @@ msgstr ""
msgid "ProjectSettings|LFS objects from this repository are available to forks. %{linkStart}How do I remove them?%{linkEnd}"
msgstr ""
msgid "ProjectSettings|Learn about commit history."
msgstr ""
msgid "ProjectSettings|Manage who can see the project in the public access directory."
msgstr ""
......@@ -28519,6 +28522,9 @@ msgstr ""
msgid "ProjectSettings|What are badges?"
msgstr ""
msgid "ProjectSettings|What are merge trains?"
msgstr ""
msgid "ProjectSettings|When merge request pipelines are enabled in the CI/CD configuration file, pipelines validate the combined results of the source and target branches. %{link_start}How to configure merge request pipelines?%{link_end}"
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment