Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 13 deletions

diff --git a/lib/gitlab/chat/responder.rb b/lib/gitlab/chat/responder.rb
index 478be5bd350..7ec64b7cfbf 100644
--- a/lib/gitlab/chat/responder.rb
+++ b/lib/gitlab/chat/responder.rb
@@ -11,21 +11,13 @@ module Gitlab
       #
       # build - A `Ci::Build` that executed a chat command.
       def self.responder_for(build)
-        if Feature.enabled?(:use_response_url_for_chat_responder)
-          response_url = build.pipeline.chat_data&.response_url
-          return unless response_url
+        response_url = build.pipeline.chat_data&.response_url
+        return unless response_url
 
-          if response_url.start_with?('https://hooks.slack.com/')
-            Gitlab::Chat::Responder::Slack.new(build)
-          else
-            Gitlab::Chat::Responder::Mattermost.new(build)
-          end
+        if response_url.start_with?('https://hooks.slack.com/')
+          Gitlab::Chat::Responder::Slack.new(build)
         else
-          integration = build.pipeline.chat_data&.chat_name&.integration
-
-          if (responder = integration.try(:chat_responder))
-            responder.new(build)
-          end
+          Gitlab::Chat::Responder::Mattermost.new(build)
         end
       end
     end