diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-20 19:29:39 -0200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-20 19:42:13 -0200 |
| commit | d1bf557aacb5dd789ccc88786b47ec174ed1de2b (patch) | |
| tree | dd61efe1fd2522861a10fe2c39bd275f3aacf953 /app | |
| parent | fed29117de6f30055d88daaa497ec18f85397ad6 (diff) | |
| download | gitlab-ce-d1bf557aacb5dd789ccc88786b47ec174ed1de2b.tar.gz | |
Rename MattermostNotificationService back to MattermostServicefix/25843
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project.rb | 2 | ||||
| -rw-r--r-- | app/models/project_services/mattermost_service.rb (renamed from app/models/project_services/mattermost_notification_service.rb) | 4 | ||||
| -rw-r--r-- | app/models/service.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 5807ea5acdc..26fa20f856d 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -94,7 +94,7 @@ class Project < ActiveRecord::Base has_one :asana_service, dependent: :destroy has_one :gemnasium_service, dependent: :destroy has_one :mattermost_slash_commands_service, dependent: :destroy - has_one :mattermost_notification_service, dependent: :destroy + has_one :mattermost_service, dependent: :destroy has_one :slack_slash_commands_service, dependent: :destroy has_one :slack_service, dependent: :destroy has_one :buildkite_service, dependent: :destroy diff --git a/app/models/project_services/mattermost_notification_service.rb b/app/models/project_services/mattermost_service.rb index de18c4b1f00..0650f930402 100644 --- a/app/models/project_services/mattermost_notification_service.rb +++ b/app/models/project_services/mattermost_service.rb @@ -1,4 +1,4 @@ -class MattermostNotificationService < ChatNotificationService +class MattermostService < ChatNotificationService def title 'Mattermost notifications' end @@ -8,7 +8,7 @@ class MattermostNotificationService < ChatNotificationService end def to_param - 'mattermost_notification' + 'mattermost' end def help diff --git a/app/models/service.rb b/app/models/service.rb index 918ed8206e0..19ef3ba9c23 100644 --- a/app/models/service.rb +++ b/app/models/service.rb @@ -216,7 +216,7 @@ class Service < ActiveRecord::Base jira kubernetes mattermost_slash_commands - mattermost_notification + mattermost pipelines_email pivotaltracker pushover |