summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-12-20 19:14:33 -0200
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-12-20 19:42:13 -0200
commitfed29117de6f30055d88daaa497ec18f85397ad6 (patch)
tree819ca4ddedde57b28acabf6b5993391bd6375b7c /app
parent1139da2745eb28be17c8fd6aa0f5de113c0f06a9 (diff)
downloadgitlab-ce-fed29117de6f30055d88daaa497ec18f85397ad6.tar.gz
Rename SlackNotificationService back to SlackService
Diffstat (limited to 'app')
-rw-r--r--app/models/project.rb2
-rw-r--r--app/models/project_services/slack_service.rb (renamed from app/models/project_services/slack_notification_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 72d3da64f2d..5807ea5acdc 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -96,7 +96,7 @@ class Project < ActiveRecord::Base
has_one :mattermost_slash_commands_service, dependent: :destroy
has_one :mattermost_notification_service, dependent: :destroy
has_one :slack_slash_commands_service, dependent: :destroy
- has_one :slack_notification_service, dependent: :destroy
+ has_one :slack_service, dependent: :destroy
has_one :buildkite_service, dependent: :destroy
has_one :bamboo_service, dependent: :destroy
has_one :teamcity_service, dependent: :destroy
diff --git a/app/models/project_services/slack_notification_service.rb b/app/models/project_services/slack_service.rb
index 3cbf89efba4..0583470d3b5 100644
--- a/app/models/project_services/slack_notification_service.rb
+++ b/app/models/project_services/slack_service.rb
@@ -1,4 +1,4 @@
-class SlackNotificationService < ChatNotificationService
+class SlackService < ChatNotificationService
def title
'Slack notifications'
end
@@ -8,7 +8,7 @@ class SlackNotificationService < ChatNotificationService
end
def to_param
- 'slack_notification'
+ 'slack'
end
def help
diff --git a/app/models/service.rb b/app/models/service.rb
index 8abd8e73e43..918ed8206e0 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -222,7 +222,7 @@ class Service < ActiveRecord::Base
pushover
redmine
slack_slash_commands
- slack_notification
+ slack
teamcity
]
end