diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-05 18:13:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-05 18:13:51 +0300 |
commit | 67d7efba05353044f927a30634c63b921b2efb73 (patch) | |
tree | 9bc6fefcae4141dd80434b4a72e8eae57ab14466 /app/views/projects/_merge_request_squash_commit_template.html.haml | |
parent | 6d29831123c8c806dc75d64e29b7691576cbea7f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/_merge_request_squash_commit_template.html.haml')
-rw-r--r-- | app/views/projects/_merge_request_squash_commit_template.html.haml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/app/views/projects/_merge_request_squash_commit_template.html.haml b/app/views/projects/_merge_request_squash_commit_template.html.haml index 81e4bbed166..be1d78154c6 100644 --- a/app/views/projects/_merge_request_squash_commit_template.html.haml +++ b/app/views/projects/_merge_request_squash_commit_template.html.haml @@ -3,14 +3,11 @@ .form-group %b= s_('ProjectSettings|Squash commit message template') %p.text-secondary - - configure_the_squash_commit_message_help_link_url = help_page_path('user/project/merge_requests/commit_templates.md') - - configure_the_squash_commit_message_help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: configure_the_squash_commit_message_help_link_url } - = s_('ProjectSettings|The commit message used when squashing commits. %{link_start}Learn more about syntax and variables.%{link_end}').html_safe % { link_start: configure_the_squash_commit_message_help_link_start, link_end: '</a>'.html_safe } + = s_('ProjectSettings|The commit message used when squashing commits.') .mb-2 = form.text_area :squash_commit_template, class: 'form-control gl-form-input', rows: 8, maxlength: 500, placeholder: '%{title}' %p.form-text.text-muted = s_('ProjectSettings|Maximum 500 characters.') - = s_('ProjectSettings|Supported variables:') - - Gitlab::MergeRequests::CommitMessageGenerator::PLACEHOLDERS.keys.each do |placeholder| - %code - = "%{#{placeholder}}".html_safe + - configure_the_squash_commit_message_help_link_url = help_page_path('user/project/merge_requests/commit_templates.md') + - configure_the_squash_commit_message_help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: configure_the_squash_commit_message_help_link_url } + = s_('ProjectSettings|%{link_start}What variables can I use?%{link_end}').html_safe % { link_start: configure_the_squash_commit_message_help_link_start, link_end: '</a>'.html_safe } |