Merge branch 'msj-merge-trains-settings-period' into 'master'

Fix unnecessary period in MR settings

See merge request gitlab-org/gitlab!57841

ee/app/views/projects/_merge_trains_settings.html.haml

@@ -4,7 +4,7 @@
   .gl-pl-6
     = form.check_box :merge_trains_enabled, class: 'form-check-input js-merge-options-merge-trains gl-pl-6', data: { qa_selector: 'merge_trains_checkbox' }
     = form.label :merge_trains_enabled, class: 'form-check-label' do
-      = s_('ProjectSettings|Enable merge trains.')
+      = s_('ProjectSettings|Enable merge trains')
       .text-secondary.mb-2
         - merge_trains_help_link_url = help_page_path('ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md')
         - merge_trains_help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: merge_trains_help_link_url }

ee/spec/features/projects/settings/disable_merge_trains_setting_spec.rb

@@ -54,7 +54,7 @@ RSpec.describe 'Disable Merge Trains Setting', :js do
     include_examples 'loads correct checkbox state'
 
     it "checking merge trains checkbox doesn't affect merge pipelines checkbox" do
-      check('Enable merge trains.')
+      check('Enable merge trains')
 
       expect(find('#project_merge_trains_enabled')).to be_checked
       expect(find('#project_merge_pipelines_enabled')).not_to be_disabled
@@ -69,7 +69,7 @@ RSpec.describe 'Disable Merge Trains Setting', :js do
     end
 
     it 'unchecking merge pipelines checkbox unchecks merge trains checkbox if it was previously checked' do
-      check('Enable merge trains.')
+      check('Enable merge trains')
       uncheck('Enable merged results pipelines')
 
       expect(find('#project_merge_pipelines_enabled')).not_to be_checked
@@ -120,7 +120,7 @@ RSpec.describe 'Disable Merge Trains Setting', :js do
     end
 
     it "unchecking merge trains checkbox doesn't affect merge pipelines checkbox" do
-      uncheck('Enable merge trains.')
+      uncheck('Enable merge trains')
 
       expect(find('#project_merge_trains_enabled')).not_to be_checked
       expect(find('#project_merge_pipelines_enabled')).not_to be_disabled

locale/gitlab.pot

@@ -24131,7 +24131,7 @@ msgstr ""
 msgid "ProjectSettings|Enable \"Delete source branch\" option by default"
 msgstr ""
 
-msgid "ProjectSettings|Enable merge trains."
+msgid "ProjectSettings|Enable merge trains"
 msgstr ""
 
 msgid "ProjectSettings|Enable merged results pipelines"