Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2024-01-04 21:13:47 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2024-01-04 21:13:47 +0300
commitcc514c362bcd4b657bf6a6d1d37f5305952df363 (patch)
tree695c721b87c573d843cfeb23be2183d65b8a9785 /lib/api
parent7de116050af7a190085c01bbf819e48e708e8eb2 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/helpers/integrations_helpers.rb9
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/api/helpers/integrations_helpers.rb b/lib/api/helpers/integrations_helpers.rb
index cb8e3697e6d..6025ffddc33 100644
--- a/lib/api/helpers/integrations_helpers.rb
+++ b/lib/api/helpers/integrations_helpers.rb
@@ -418,14 +418,7 @@ module API
desc: 'Enable comments inside Jira issues on each GitLab event (commit / merge request)'
}
],
- 'mattermost-slash-commands' => [
- {
- required: true,
- name: :token,
- type: String,
- desc: 'The Mattermost token'
- }
- ],
+ 'mattermost-slash-commands' => ::Integrations::MattermostSlashCommands.api_fields,
'slack-slash-commands' => [
{
required: true,