summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-11-18 16:16:45 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2016-11-18 17:27:14 +0100
commit1db1896ed2375481d53f74f7900d259fe068ef64 (patch)
treeec82ca5c9ba8da236aa78a207c7926dcf3ef5fe4 /app
parentc72c76fde3882b7c2f778bf85132cd2c80f01f5b (diff)
downloadgitlab-ce-1db1896ed2375481d53f74f7900d259fe068ef64.tar.gz
Rename mattermost_command to mattermost_slash_commandszj-slash-commands-mattermost
Diffstat (limited to 'app')
-rw-r--r--app/models/project.rb2
-rw-r--r--app/models/project_services/mattermost_slash_commands_service.rb (renamed from app/models/project_services/mattermost_command_service.rb)4
-rw-r--r--app/models/service.rb2
3 files changed, 4 insertions, 4 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index e6ae91f259d..34b44f90f1c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -92,7 +92,7 @@ class Project < ActiveRecord::Base
has_one :assembla_service, dependent: :destroy
has_one :asana_service, dependent: :destroy
has_one :gemnasium_service, dependent: :destroy
- has_one :mattermost_command_service, dependent: :destroy
+ has_one :mattermost_slash_commands_service, dependent: :destroy
has_one :slack_service, dependent: :destroy
has_one :buildkite_service, dependent: :destroy
has_one :bamboo_service, dependent: :destroy
diff --git a/app/models/project_services/mattermost_command_service.rb b/app/models/project_services/mattermost_slash_commands_service.rb
index 058b323ff20..67902329593 100644
--- a/app/models/project_services/mattermost_command_service.rb
+++ b/app/models/project_services/mattermost_slash_commands_service.rb
@@ -1,4 +1,4 @@
-class MattermostCommandService < ChatService
+class MattermostSlashCommandsService < ChatService
include TriggersHelper
prop_accessor :token
@@ -16,7 +16,7 @@ class MattermostCommandService < ChatService
end
def to_param
- 'mattermost_command'
+ 'mattermost_slash_commands'
end
def help
diff --git a/app/models/service.rb b/app/models/service.rb
index 7ca44ced20e..edd6b5329f3 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -213,7 +213,7 @@ class Service < ActiveRecord::Base
hipchat
irker
jira
- mattermost_command
+ mattermost_slash_commands
pipelines_email
pivotaltracker
pushover