Merge branch 'fix-mattermost-username' into 'master'

Fix Mattermost command creation by specifying username

See merge request !8257
parent 5e1080c5
...@@ -46,6 +46,6 @@ class MattermostSlashCommandsService < ChatSlashCommandsService ...@@ -46,6 +46,6 @@ class MattermostSlashCommandsService < ChatSlashCommandsService
description: "Perform common operations on: #{pretty_project_name}", description: "Perform common operations on: #{pretty_project_name}",
display_name: "GitLab / #{pretty_project_name}", display_name: "GitLab / #{pretty_project_name}",
method: 'P', method: 'P',
user_name: 'GitLab') username: 'GitLab')
end end
end end
---
title: Fix Mattermost command creation by specifying username
merge_request:
author:
...@@ -36,7 +36,7 @@ describe MattermostSlashCommandsService, :models do ...@@ -36,7 +36,7 @@ describe MattermostSlashCommandsService, :models do
description: "Perform common operations on: #{project.name_with_namespace}", description: "Perform common operations on: #{project.name_with_namespace}",
display_name: "GitLab / #{project.name_with_namespace}", display_name: "GitLab / #{project.name_with_namespace}",
method: 'P', method: 'P',
user_name: 'GitLab' }.to_json). username: 'GitLab' }.to_json).
to_return( to_return(
status: 200, status: 200,
headers: { 'Content-Type' => 'application/json' }, headers: { 'Content-Type' => 'application/json' },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment