diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-22 14:59:47 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-22 14:59:47 +0000 |
| commit | 256a5e3ab1863e9d41cb0dee7bb52fe53c52c963 (patch) | |
| tree | 15b8e30c79b154f889fef685069ad6ec9248482d | |
| parent | 7e26afe6e8cb0f7b2b93968cb77ad06cf1631ee5 (diff) | |
| parent | d64d2a22755c7c10ad69b4bbbdf0b5ad7d3fd2a8 (diff) | |
| download | gitlab-ce-256a5e3ab1863e9d41cb0dee7bb52fe53c52c963.tar.gz | |
Merge branch 'fix-mattermost-username' into 'master'
Fix Mattermost command creation by specifying username
See merge request !8257
3 files changed, 6 insertions, 2 deletions
diff --git a/app/models/project_services/mattermost_slash_commands_service.rb b/app/models/project_services/mattermost_slash_commands_service.rb index 6c78c0af71c..2cb481182d7 100644 --- a/app/models/project_services/mattermost_slash_commands_service.rb +++ b/app/models/project_services/mattermost_slash_commands_service.rb @@ -46,6 +46,6 @@ class MattermostSlashCommandsService < ChatSlashCommandsService description: "Perform common operations on: #{pretty_project_name}", display_name: "GitLab / #{pretty_project_name}", method: 'P', - user_name: 'GitLab') + username: 'GitLab') end end diff --git a/changelogs/unreleased/fix-mattermost-username.yml b/changelogs/unreleased/fix-mattermost-username.yml new file mode 100644 index 00000000000..ca298e4d008 --- /dev/null +++ b/changelogs/unreleased/fix-mattermost-username.yml @@ -0,0 +1,4 @@ +--- +title: Fix Mattermost command creation by specifying username +merge_request: +author: diff --git a/spec/models/project_services/mattermost_slash_commands_service_spec.rb b/spec/models/project_services/mattermost_slash_commands_service_spec.rb index d6f4fbd7265..672ced68681 100644 --- a/spec/models/project_services/mattermost_slash_commands_service_spec.rb +++ b/spec/models/project_services/mattermost_slash_commands_service_spec.rb @@ -36,7 +36,7 @@ describe MattermostSlashCommandsService, :models do description: "Perform common operations on: #{project.name_with_namespace}", display_name: "GitLab / #{project.name_with_namespace}", method: 'P', - user_name: 'GitLab' }.to_json). + username: 'GitLab' }.to_json). to_return( status: 200, headers: { 'Content-Type' => 'application/json' }, |