summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorblackst0ne <blackst0ne.ru@gmail.com>2018-11-10 09:50:37 +1100
committerblackst0ne <blackst0ne.ru@gmail.com>2018-11-10 09:50:37 +1100
commite03ebd80bb610fb106e82c4ab517c050dbd7f6a7 (patch)
treef3d776ec76bffa7e336ffde63a22a967b4695c91
parent079a75088e482c5c32cbe8b4606584256284316b (diff)
downloadgitlab-ce-blackst0ne-add-discord-service.tar.gz
-rw-r--r--app/models/project_services/discord_service.rb6
-rw-r--r--spec/models/project_services/discord_service_spec.rb2
2 files changed, 2 insertions, 6 deletions
diff --git a/app/models/project_services/discord_service.rb b/app/models/project_services/discord_service.rb
index ee7d737a68b..21afd14dbff 100644
--- a/app/models/project_services/discord_service.rb
+++ b/app/models/project_services/discord_service.rb
@@ -25,10 +25,6 @@ class DiscordService < ChatNotificationService
</ol>"
end
- def webhook_placeholder
- "https://discordapp.com/api/webhooks/..."
- end
-
def event_field(event)
# No-op.
end
@@ -39,7 +35,7 @@ class DiscordService < ChatNotificationService
def default_fields
[
- { type: "text", name: "webhook", placeholder: "e.g. #{webhook_placeholder}" },
+ { type: "text", name: "webhook", placeholder: "e.g. https://discordapp.com/api/webhooks/…" },
{ type: "checkbox", name: "notify_only_broken_pipelines" },
{ type: "checkbox", name: "notify_only_default_branch" }
]
diff --git a/spec/models/project_services/discord_service_spec.rb b/spec/models/project_services/discord_service_spec.rb
index 52e2314b080..be82f223478 100644
--- a/spec/models/project_services/discord_service_spec.rb
+++ b/spec/models/project_services/discord_service_spec.rb
@@ -3,7 +3,7 @@
require "spec_helper"
describe DiscordService do
- it_behaves_like "chat service", "Hangouts Chat" do
+ it_behaves_like "chat service", "Discord notifications" do
let(:client) { Discordrb::Webhooks::Client }
let(:client_arguments) { { url: webhook_url } }
let(:content_key) { :content }