Commit 0fa1a916 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'fix_chatops_responder' into 'master'

Fix ChatOps responder for gitlab.com

See merge request gitlab-org/gitlab-ee!10416
parents bf4e8b1b a23b2e05
...@@ -40,4 +40,8 @@ class GitlabSlackApplicationService < Service ...@@ -40,4 +40,8 @@ class GitlabSlackApplicationService < Service
def fields def fields
[] []
end end
def chat_responder
Gitlab::Chat::Responder::Slack
end
end end
...@@ -30,10 +30,6 @@ module Projects ...@@ -30,10 +30,6 @@ module Projects
success success
end end
def chat_responder
Gitlab::Chat::Responder::Slack
end
private private
# rubocop: disable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord
......
---
title: Fix ChatOps Slack responder for gitlab.com
merge_request: 10416
author:
type: fixed
# frozen_string_literal: true
require 'spec_helper'
describe GitlabSlackApplicationService do
describe '#chat_responder' do
it 'returns the chat responder to use' do
expect(subject.chat_responder).to eq(Gitlab::Chat::Responder::Slack)
end
end
end
...@@ -46,12 +46,4 @@ describe Projects::SlackApplicationInstallService do ...@@ -46,12 +46,4 @@ describe Projects::SlackApplicationInstallService do
expect_slack_integration_is_created(project) expect_slack_integration_is_created(project)
expect_chat_name_is_created(project) expect_chat_name_is_created(project)
end end
describe '#chat_responder' do
it 'returns the chat responder to use' do
srv = service
expect(srv.chat_responder).to eq(Gitlab::Chat::Responder::Slack)
end
end
end end
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