diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-12 10:12:48 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-12 10:12:48 +0000 |
| commit | ca3e9b975922339b25cc7ca902c7c46e24ed1170 (patch) | |
| tree | 0223d2408634923ddfba61c3b8f20656f76981d4 /lib/api | |
| parent | 89686b90939c7dc1d6c5376d711988efd7809f13 (diff) | |
| parent | e03ebd80bb610fb106e82c4ab517c050dbd7f6a7 (diff) | |
| download | gitlab-ce-ca3e9b975922339b25cc7ca902c7c46e24ed1170.tar.gz | |
Merge branch 'blackst0ne-add-discord-service' into 'master'
Add Discord integration
Closes #21635
See merge request gitlab-org/gitlab-ce!22684
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/services.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/api/services.rb b/lib/api/services.rb index 0ae05ce08f1..1cb3b8a7277 100644 --- a/lib/api/services.rb +++ b/lib/api/services.rb @@ -298,6 +298,14 @@ module API desc: 'Title' } ], + 'discord' => [ + { + required: true, + name: :webhook, + type: String, + desc: 'Discord webhook. e.g. https://discordapp.com/api/webhooks/…' + } + ], 'drone-ci' => [ { required: true, @@ -677,6 +685,7 @@ module API BuildkiteService, CampfireService, CustomIssueTrackerService, + DiscordService, DroneCiService, EmailsOnPushService, ExternalWikiService, |