summaryrefslogtreecommitdiff
path: root/app/views/projects/_merge_request_merge_suggestions_settings.html.haml
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/projects/_merge_request_merge_suggestions_settings.html.haml')
-rw-r--r--app/views/projects/_merge_request_merge_suggestions_settings.html.haml12
1 files changed, 5 insertions, 7 deletions
diff --git a/app/views/projects/_merge_request_merge_suggestions_settings.html.haml b/app/views/projects/_merge_request_merge_suggestions_settings.html.haml
index 31a85a204be..12ab905479a 100644
--- a/app/views/projects/_merge_request_merge_suggestions_settings.html.haml
+++ b/app/views/projects/_merge_request_merge_suggestions_settings.html.haml
@@ -3,15 +3,13 @@
.form-group
%b= s_('ProjectSettings|Merge suggestions')
%p.text-secondary
- = s_('ProjectSettings|The commit message used to apply merge request suggestions')
- = link_to sprite_icon('question-o'),
- help_page_path('user/discussions/index.md',
- anchor: 'configure-the-commit-message-for-applied-suggestions'),
- target: '_blank'
+ - configure_the_commit_message_for_applied_suggestions_help_link_url = help_page_path('user/discussions/index.md', anchor: 'configure-the-commit-message-for-applied-suggestions')
+ - configure_the_commit_message_for_applied_suggestions_help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: configure_the_commit_message_for_applied_suggestions_help_link_url }
+ = s_('ProjectSettings|The commit message used when applying merge request suggestions. %{link_start}Learn more about suggestions.%{link_end}').html_safe % { link_start: configure_the_commit_message_for_applied_suggestions_help_link_start, link_end: '</a>'.html_safe }
.mb-2
- = form.text_field :suggestion_commit_message, class: 'form-control gl-form-input mb-2', placeholder: Gitlab::Suggestions::CommitMessage::DEFAULT_SUGGESTION_COMMIT_MESSAGE
+ = form.text_field :suggestion_commit_message, class: 'form-control mb-2', placeholder: Gitlab::Suggestions::CommitMessage::DEFAULT_SUGGESTION_COMMIT_MESSAGE
%p.form-text.text-muted
- = s_('ProjectSettings|The variables GitLab supports:')
+ = s_('ProjectSettings|Supported variables:')
- Gitlab::Suggestions::CommitMessage::PLACEHOLDERS.keys.each do |placeholder|
%code
= "%{#{placeholder}}".html_safe