Commit fed29117 authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre
Browse files

Rename SlackNotificationService back to SlackService

parent cd1bb42e440b
......@@ -96,7 +96,7 @@ def update_forks_visibility_level
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
......
class SlackNotificationService < ChatNotificationService
class SlackService < ChatNotificationService
def title
'Slack notifications'
end
......@@ -8,7 +8,7 @@ def description
end
def to_param
'slack_notification'
'slack'
end
def help
......
......@@ -222,7 +222,7 @@ def self.available_services_names
pushover
redmine
slack_slash_commands
slack_notification
slack
teamcity
]
end
......
......@@ -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']
......
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
......@@ -480,7 +480,7 @@ class Services < Grape::API
desc: 'The description of the tracker'
}
],
'slack-notification' => [
'slack' => [
{
required: true,
name: :webhook,
......
......@@ -2,8 +2,8 @@
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
......
......@@ -137,7 +137,7 @@ project:
- assembla_service
- asana_service
- gemnasium_service
- slack_notification_service
- slack_service
- mattermost_notification_service
- buildkite_service
- bamboo_service
......
require 'spec_helper'
describe SlackNotificationService, models: true do
describe SlackService, models: true do
it_behaves_like "slack or mattermost notifications"
end
......@@ -21,7 +21,7 @@
it { is_expected.to have_many(:hooks).dependent(:destroy) }
it { is_expected.to have_many(:protected_branches).dependent(:destroy) }
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(:slack_service).dependent(:destroy) }
it { is_expected.to have_one(:mattermost_notification_service).dependent(:destroy) }
it { is_expected.to have_one(:pushover_service).dependent(:destroy) }
it { is_expected.to have_one(:asana_service).dependent(:destroy) }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment