diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-20 23:12:25 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-20 23:12:25 +0000 |
| commit | b86f45004e931655176220d451cde1e9320a1db1 (patch) | |
| tree | a630c854fb1b14511e9a316890d293cb1c52674c /lib/api | |
| parent | 92a91a880327877fe3ac1825a4c5b638333cf586 (diff) | |
| parent | d1bf557aacb5dd789ccc88786b47ec174ed1de2b (diff) | |
| download | gitlab-ce-b86f45004e931655176220d451cde1e9320a1db1.tar.gz | |
Merge branch 'fix/25843' into 'master'
Rename SlackNotificationService back to SlackService
## What does this MR do?
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8191#note_20310845
## What are the relevant issue numbers?
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25843
/cc @yorickpeterse @stanhu @smcgivern @felipe_artur @ayufan
See merge request !8208
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/services.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/services.rb b/lib/api/services.rb index aa97f6af0b2..d11cdce4e18 100644 --- a/lib/api/services.rb +++ b/lib/api/services.rb @@ -480,7 +480,7 @@ module API desc: 'The description of the tracker' } ], - 'slack-notification' => [ + 'slack' => [ { required: true, name: :webhook, @@ -500,7 +500,7 @@ module API desc: 'The channel name' } ], - 'mattermost-notification' => [ + 'mattermost' => [ { required: true, name: :webhook, |