From 6f34f447df18a2674fdf4646244fe3fb0a0fae0a Mon Sep 17 00:00:00 2001 From: Thomas Randolph Date: Fri, 4 Feb 2022 14:55:17 -0700 Subject: [PATCH] Add documentation links to Merge Request settings page This also swaps a question mark icon for a short sentence. Changelog: other --- .../projects/_merge_request_merge_method_settings.html.haml | 6 ++++-- locale/gitlab.pot | 6 ++++++ 2 files changed, 10 insertions(+), 2 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 b0e3bda2b4f8d4..778586a592e4d6 100644 --- a/app/views/projects/_merge_request_merge_method_settings.html.haml +++ b/app/views/projects/_merge_request_merge_method_settings.html.haml @@ -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' diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 22ba8da3e14dad..82e38371cc24a7 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -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 "" -- GitLab