summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2016-12-22 14:17:10 +0100
committerZ.J. van de Weg <git@zjvandeweg.nl>2016-12-22 14:17:10 +0100
commitc724126604f3592a7e8e3d121a7d27ecdfb760b4 (patch)
tree998305590edff97590cf0484f43dbb1ee442baf9
parent6d9c1d3efce00da95832feaaf36227bcbffecadf (diff)
downloadgitlab-ce-c724126604f3592a7e8e3d121a7d27ecdfb760b4.tar.gz
Post username as property, not user_namezj-mattermost-config-username
-rw-r--r--app/models/project_services/mattermost_slash_commands_service.rb2
-rw-r--r--spec/models/project_services/mattermost_slash_commands_service_spec.rb2
2 files changed, 2 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/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' },