summaryrefslogtreecommitdiff
path: root/app/controllers/profiles/chat_names_controller.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-09 18:09:11 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-09 18:09:11 +0000
commitd23f33082ad893fad172b17f1ce66bd847671d56 (patch)
treebdffb3f1a3f4855d2a9a7f8762f2812366c75a41 /app/controllers/profiles/chat_names_controller.rb
parent3670ddd229b178c0a2e09a1466ddfd7fd2f7855d (diff)
downloadgitlab-ce-d23f33082ad893fad172b17f1ce66bd847671d56.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/profiles/chat_names_controller.rb')
-rw-r--r--app/controllers/profiles/chat_names_controller.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/app/controllers/profiles/chat_names_controller.rb b/app/controllers/profiles/chat_names_controller.rb
index 564a84a0829..c4384c962d2 100644
--- a/app/controllers/profiles/chat_names_controller.rb
+++ b/app/controllers/profiles/chat_names_controller.rb
@@ -68,8 +68,13 @@ class Profiles::ChatNamesController < Profiles::ApplicationController
end
def integration_name
+ return s_('Integrations|GitLab for Slack app') if slack_app_params?
+
s_('Integrations|Mattermost slash commands')
end
-end
-Profiles::ChatNamesController.prepend_mod
+ def slack_app_params?
+ chat_name_params[:team_id].start_with?('T') &&
+ chat_name_params[:chat_id].start_with?('U', 'W')
+ end
+end