Merge branch 'fix/25843' into 'master'

Rename SlackNotificationService back to SlackService

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8191#note_20310845

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25843

/cc @yorickpeterse @stanhu @smcgivern @felipe_artur @ayufan

See merge request !8208

13 files changed, 24 insertions, 27 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index 5d5d6737dad..002806b233c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -95,8 +95,8 @@ 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 :slack_notification_service, dependent: :destroy
+  has_one :mattermost_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/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/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 0bbab078cf6..e21b4fecd32 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -216,12 +216,12 @@ class Service < ActiveRecord::Base
       jira
       kubernetes
       mattermost_slash_commands
+      mattermost
       pipelines_email
       pivotaltracker
       pushover
       redmine
-      mattermost_notification
-      slack_notification
+      slack
       teamcity
     ]
   end
diff --git a/db/migrate/20141006143943_move_slack_service_to_webhook.rb b/db/migrate/20141006143943_move_slack_service_to_webhook.rb
index 42e88d6d6e3..561184615cc 100644
--- a/db/migrate/20141006143943_move_slack_service_to_webhook.rb
+++ b/db/migrate/20141006143943_move_slack_service_to_webhook.rb
@@ -5,7 +5,7 @@ class MoveSlackServiceToWebhook < ActiveRecord::Migration
   DOWNTIME_REASON = 'Move old fields "token" and "subdomain" to one single field "webhook"'
 
   def change
-    SlackNotificationService.all.each do |slack_service|
+    SlackService.all.each do |slack_service|
       if ["token", "subdomain"].all? { |property| slack_service.properties.key? property }
         token = slack_service.properties['token']
         subdomain = slack_service.properties['subdomain']
diff --git a/db/migrate/20161213172958_change_slack_service_to_slack_notification_service.rb b/db/migrate/20161213172958_change_slack_service_to_slack_notification_service.rb
index a7278d7b5a6..dc38d0ac906 100644
--- a/db/migrate/20161213172958_change_slack_service_to_slack_notification_service.rb
+++ b/db/migrate/20161213172958_change_slack_service_to_slack_notification_service.rb
@@ -1,14 +1,11 @@
 class ChangeSlackServiceToSlackNotificationService < ActiveRecord::Migration
   include Gitlab::Database::MigrationHelpers
 
-  DOWNTIME = true
-  DOWNTIME_REASON = 'Rename SlackService to SlackNotificationService'
+  DOWNTIME = false
 
-  def up
-    execute("UPDATE services SET type = 'SlackNotificationService' WHERE type = 'SlackService'")
-  end
-
-  def down
-    execute("UPDATE services SET type = 'SlackService' WHERE type = 'SlackNotificationService'")
+  # This migration is a no-op, as it existed in an RC but we renamed
+  # SlackNotificationService back to SlackService:
+  #   https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8191#note_20310845
+  def change
   end
 end
diff --git a/lib/api/services.rb b/lib/api/services.rb
index 59232c84c24..d5493d719d9 100644
--- a/lib/api/services.rb
+++ b/lib/api/services.rb
@@ -473,7 +473,7 @@ module API
           desc: 'The description of the tracker'
         }
       ],
-      'slack-notification' => [
+      'slack' => [
         {
           required: true,
           name: :webhook,
@@ -493,7 +493,7 @@ module API
           desc: 'The channel name'
         }
       ],
-      'mattermost-notification' => [
+      'mattermost' => [
         {
           required: true,
           name: :webhook,
diff --git a/spec/features/projects/import_export/test_project_export.tar.gz b/spec/features/projects/import_export/test_project_export.tar.gz
index d3165d07d7b..7655c2b351f 100644
--- a/spec/features/projects/import_export/test_project_export.tar.gz
+++ b/spec/features/projects/import_export/test_project_export.tar.gz
diff --git a/spec/features/projects/services/slack_service_spec.rb b/spec/features/projects/services/slack_service_spec.rb
index 320ed13a01d..16541f51d98 100644
--- a/spec/features/projects/services/slack_service_spec.rb
+++ b/spec/features/projects/services/slack_service_spec.rb
@@ -2,8 +2,8 @@ require 'spec_helper'
 
 feature 'Projects > Slack service > Setup events', feature: true do
   let(:user) { create(:user) }
-  let(:service) { SlackNotificationService.new }
-  let(:project) { create(:project, slack_notification_service: service) }
+  let(:service) { SlackService.new }
+  let(:project) { create(:project, slack_service: service) }
 
   background do
     service.fields
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 9b49d6837c3..068137f6255 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -136,8 +136,8 @@ project:
 - assembla_service
 - asana_service
 - gemnasium_service
-- slack_notification_service
-- mattermost_notification_service
+- slack_service
+- mattermost_service
 - buildkite_service
 - bamboo_service
 - teamcity_service
diff --git a/spec/models/project_services/slack_notification_service_spec.rb b/spec/models/project_services/mattermost_service_spec.rb
index 59ddddf7454..1e5b4c715c3 100644
--- a/spec/models/project_services/slack_notification_service_spec.rb
+++ b/spec/models/project_services/mattermost_service_spec.rb
@@ -1,5 +1,5 @@
 require 'spec_helper'
 
-describe SlackNotificationService, models: true do
+describe MattermostService, models: true do
   it_behaves_like "slack or mattermost"
 end
diff --git a/spec/models/project_services/mattermost_notification_service_spec.rb b/spec/models/project_services/slack_service_spec.rb
index c01e64b4c8e..4928391fd7e 100644
--- a/spec/models/project_services/mattermost_notification_service_spec.rb
+++ b/spec/models/project_services/slack_service_spec.rb
@@ -1,5 +1,5 @@
 require 'spec_helper'
 
-describe MattermostNotificationService, models: true do
+describe SlackService, models: true do
   it_behaves_like "slack or mattermost"
 end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index ed6b2c6a22b..09f84f255c6 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -22,8 +22,8 @@ describe Project, models: true do
     it { is_expected.to have_many(:protected_branches).dependent(:destroy) }
     it { is_expected.to have_many(:chat_services) }
     it { is_expected.to have_one(:forked_project_link).dependent(:destroy) }
-    it { is_expected.to have_one(:slack_notification_service).dependent(:destroy) }
-    it { is_expected.to have_one(:mattermost_notification_service).dependent(:destroy) }
+    it { is_expected.to have_one(:slack_service).dependent(:destroy) }
+    it { is_expected.to have_one(:mattermost_service).dependent(:destroy) }
     it { is_expected.to have_one(:pushover_service).dependent(:destroy) }
     it { is_expected.to have_one(:asana_service).dependent(:destroy) }
     it { is_expected.to have_many(:boards).dependent(:destroy) }