Merge branch '300610-mattermost-ui-page' into 'master'

OKR: Revise Mattermost integration page in UI

See merge request gitlab-org/gitlab!57758

app/models/project_services/mattermost_slash_commands_service.rb

@@ -14,7 +14,7 @@ class MattermostSlashCommandsService < SlashCommandsService
   end
 
   def description
-    "Perform common operations in Mattermost"
+    "Perform common tasks with slash commands."
   end
 
   def self.to_param

app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml

 - pretty_name = @project&.full_name ? html_escape(@project&.full_name) : '<' + _('project name') + '>'
 - run_actions_text = html_escape(s_("ProjectService|Perform common operations on GitLab project: %{project_name}")) % { project_name: pretty_name }
 
-%p= s_("ProjectService|To set up this service:")
+%p= s_("ProjectService|To configure this integration, you should:")
 %ul.list-unstyled.indent-list
   %li
     1.
-    = link_to 'https://docs.mattermost.com/developer/slash-commands.html#enabling-custom-commands', target: '_blank', rel: 'noopener noreferrer nofollow' do
+    = link_to 'https://docs.gitlab.com/ee/user/project/integrations/mattermost_slash_commands.html#enable-custom-slash-commands', target: '_blank', rel: 'noopener noreferrer nofollow' do
       Enable custom slash commands
       = sprite_icon('external-link')
-    on your Mattermost installation
+    on your Mattermost installation.
   %li
     2.
-    = link_to 'https://docs.mattermost.com/developer/slash-commands.html#set-up-a-custom-command', target: '_blank', rel: 'noopener noreferrer nofollow' do
+    = link_to 'https://docs.gitlab.com/ee/user/project/integrations/mattermost_slash_commands.html#create-a-slash-command', target: '_blank', rel: 'noopener noreferrer nofollow' do
       Add a slash command
       = sprite_icon('external-link')
-    in your Mattermost team with these options:
+    in your Mattermost team with the options listed below.
+  %li
+    3. Paste the token into the
+    %strong Token
+    field.
+  %li
+    4. Select the
+    %strong Active
+    check box, then select
+    %strong Save changes
+    to start using GitLab inside Mattermost!
+
 %hr
 
 .help-form
@@ -85,17 +96,3 @@
       = text_field_tag :autocomplete_description, run_actions_text, class: 'form-control form-control-sm', readonly: 'readonly'
       .input-group-append
         = clipboard_button(target: '#autocomplete_description', class: 'input-group-text')
-
-%hr
-
-%ul.list-unstyled.indent-list
-  %li
-    3. Paste the
-    %strong Token
-    into the field below
-  %li
-    4. Select the
-    %strong Active
-    checkbox, press
-    %strong Save changes
-    and start using GitLab inside Mattermost!

app/views/projects/services/mattermost_slash_commands/_help.html.haml

@@ -3,12 +3,12 @@
 .info-well
   .well-segment
     %p
-      = s_("MattermostService|This service allows users to perform common operations on this project by entering slash commands in Mattermost.")
+      = s_("MattermostService|Use this service to perform common tasks in your project by entering slash commands in Mattermost.")
       = link_to help_page_path('user/project/integrations/mattermost_slash_commands.md'), target: '_blank' do
-        = _("View documentation")
+        = _("How do I configure this integration?")
         = sprite_icon('external-link')
     %p.inline
-      = s_("MattermostService|See list of available commands in Mattermost after setting up this service, by entering")
+      = s_("MattermostService|After you configure the integration, view your new Mattermost commands by entering")
     %kbd.inline /<trigger> help
     - if !enabled && @service.project_level?
       = render 'projects/services/mattermost_slash_commands/detailed_help', subject: @service

locale/gitlab.pot

@@ -15582,6 +15582,9 @@ msgstr ""
 msgid "How do I configure runners?"
 msgstr ""
 
+msgid "How do I configure this integration?"
+msgstr ""
+
 msgid "How do I generate it?"
 msgstr ""
 
@@ -18939,6 +18942,9 @@ msgstr ""
 msgid "MattermostService|Add to Mattermost"
 msgstr ""
 
+msgid "MattermostService|After you configure the integration, view your new Mattermost commands by entering"
+msgstr ""
+
 msgid "MattermostService|Command trigger word"
 msgstr ""
 
@@ -18957,13 +18963,10 @@ msgstr ""
 msgid "MattermostService|Response username"
 msgstr ""
 
-msgid "MattermostService|See list of available commands in Mattermost after setting up this service, by entering"
-msgstr ""
-
 msgid "MattermostService|Suggestions:"
 msgstr ""
 
-msgid "MattermostService|This service allows users to perform common operations on this project by entering slash commands in Mattermost."
+msgid "MattermostService|Use this service to perform common tasks in your project by entering slash commands in Mattermost."
 msgstr ""
 
 msgid "Max 100,000 events"
@@ -24158,7 +24161,7 @@ msgstr ""
 msgid "ProjectService|TeamCity URL"
 msgstr ""
 
-msgid "ProjectService|To set up this service:"
+msgid "ProjectService|To configure this integration, you should:"
 msgstr ""
 
 msgid "ProjectSettings|%{link_start}What are description templates?%{link_end}"

spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe 'Set up Mattermost slash commands', :js do
       let(:mattermost_enabled) { true }
 
       it 'shows a help message' do
-        expect(page).to have_content("This service allows users to perform common")
+        expect(page).to have_content("Use this service to perform common")
       end
 
       it 'shows a token placeholder' do