Merge branch 'merge-commit-template-remove-placeholders' into 'master'

Remove commit templates variable placeholders from settings

See merge request gitlab-org/gitlab!77350

app/views/projects/_merge_request_merge_commit_template.html.haml

@@ -3,15 +3,12 @@
 .form-group
   %b= s_('ProjectSettings|Merge commit message template')
   %p.text-secondary
-    - configure_the_merge_commit_message_help_link_url = help_page_path('user/project/merge_requests/commit_templates.md')
-    - configure_the_merge_commit_message_help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: configure_the_merge_commit_message_help_link_url }
-    = s_('ProjectSettings|The commit message used when merging, if the merge method creates a merge commit. %{link_start}Learn more about syntax and variables.%{link_end}').html_safe % { link_start: configure_the_merge_commit_message_help_link_start, link_end: '</a>'.html_safe }
+    = s_('ProjectSettings|The commit message used when merging, if the merge method creates a merge commit.')
   .mb-2
     - default_merge_commit_template = "Merge branch '%{source_branch}' into '%{target_branch}'\n\n%{title}\n\n%{issues}\n\nSee merge request %{reference}"
     = form.text_area :merge_commit_template, class: 'form-control gl-form-input', rows: 8, maxlength: 500, placeholder: default_merge_commit_template
     %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_merge_commit_message_help_link_url = help_page_path('user/project/merge_requests/commit_templates.md')
+      - configure_the_merge_commit_message_help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: configure_the_merge_commit_message_help_link_url }
+      = s_('ProjectSettings|%{link_start}What variables can I use?%{link_end}').html_safe % { link_start: configure_the_merge_commit_message_help_link_start, link_end: '</a>'.html_safe }

app/views/projects/_merge_request_merge_suggestions_settings.html.haml

@@ -3,13 +3,10 @@
 .form-group
   %b= s_('ProjectSettings|Merge suggestions')
   %p.text-secondary
-    - configure_the_commit_message_for_applied_suggestions_help_link_url = help_page_path('user/project/merge_requests/reviews/suggestions.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 }
+    = s_('ProjectSettings|The commit message used when applying merge request suggestions.')
   .mb-2
     = 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|Supported variables:')
-      - Gitlab::Suggestions::CommitMessage::PLACEHOLDERS.keys.each do |placeholder|
-        %code
-          = "%{#{placeholder}}".html_safe
+      - configure_the_commit_message_for_applied_suggestions_help_link_url = help_page_path('user/project/merge_requests/reviews/suggestions.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|%{link_start}What variables can I use?%{link_end}').html_safe % { link_start: configure_the_commit_message_for_applied_suggestions_help_link_start, link_end: '</a>'.html_safe }

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 }

doc/user/project/merge_requests/reviews/suggestions.md

@@ -89,7 +89,7 @@ These commit messages can be customized to follow any guidelines you might have.
 To do so, expand the **Merge requests** tab within your project's **General**
 settings and change the **Merge suggestions** text:
 
-![Custom commit message for applied suggestions](img/suggestions_custom_commit_messages_v13_1.jpg)
+![Custom commit message for applied suggestions](img/suggestions_custom_commit_messages_v14_7.png)
 
 You can also use following variables besides static text:
 

locale/gitlab.pot

@@ -27694,6 +27694,9 @@ msgstr ""
 msgid "ProjectSettings|%{link_start}What are description templates?%{link_end}"
 msgstr ""
 
+msgid "ProjectSettings|%{link_start}What variables can I use?%{link_end}"
+msgstr ""
+
 msgid "ProjectSettings|Additional settings that influence how and when merges are done."
 msgstr ""
 
@@ -27946,19 +27949,16 @@ msgstr ""
 msgid "ProjectSettings|Submit changes to be merged upstream."
 msgstr ""
 
-msgid "ProjectSettings|Supported variables:"
-msgstr ""
-
 msgid "ProjectSettings|Target project"
 msgstr ""
 
-msgid "ProjectSettings|The commit message used when applying merge request suggestions. %{link_start}Learn more about suggestions.%{link_end}"
+msgid "ProjectSettings|The commit message used when applying merge request suggestions."
 msgstr ""
 
-msgid "ProjectSettings|The commit message used when merging, if the merge method creates a merge commit. %{link_start}Learn more about syntax and variables.%{link_end}"
+msgid "ProjectSettings|The commit message used when merging, if the merge method creates a merge commit."
 msgstr ""
 
-msgid "ProjectSettings|The commit message used when squashing commits. %{link_start}Learn more about syntax and variables.%{link_end}"
+msgid "ProjectSettings|The commit message used when squashing commits."
 msgstr ""
 
 msgid "ProjectSettings|The default target project for merge requests created in this fork project."

spec/views/projects/edit.html.haml_spec.rb

@@ -29,19 +29,6 @@ RSpec.describe 'projects/edit' do
   end
 
   context 'merge suggestions settings' do
-    it 'displays all possible variables' do
-      render
-
-      expect(rendered).to have_content('%{branch_name}')
-      expect(rendered).to have_content('%{files_count}')
-      expect(rendered).to have_content('%{file_paths}')
-      expect(rendered).to have_content('%{project_name}')
-      expect(rendered).to have_content('%{project_path}')
-      expect(rendered).to have_content('%{user_full_name}')
-      expect(rendered).to have_content('%{username}')
-      expect(rendered).to have_content('%{suggestions_count}')
-    end
-
     it 'displays a placeholder if none is set' do
       render
 
@@ -58,20 +45,6 @@ RSpec.describe 'projects/edit' do
   end
 
   context 'merge commit template' do
-    it 'displays all possible variables' do
-      render
-
-      expect(rendered).to have_content('%{source_branch}')
-      expect(rendered).to have_content('%{target_branch}')
-      expect(rendered).to have_content('%{title}')
-      expect(rendered).to have_content('%{issues}')
-      expect(rendered).to have_content('%{description}')
-      expect(rendered).to have_content('%{reference}')
-      expect(rendered).to have_content('%{approved_by}')
-      expect(rendered).to have_content('%{url}')
-      expect(rendered).to have_content('%{merged_by}')
-    end
-
     it 'displays a placeholder if none is set' do
       render