diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-21 02:12:25 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-21 02:26:13 +0300 |
| commit | 0499bdc16c1e122e891ca454ab6176c7e72b6557 (patch) | |
| tree | 5414bc955f5e4ed31e5fccd03b9f863d7b8eb8db /lib | |
| parent | 431b9d1b6aca48c3b299e10aff6f0b2a60649549 (diff) | |
Merge branch 'fix/25843' into 'master'
Rename SlackNotificationService back to SlackService
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8191#note_20310845
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')
| -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 59232c84c24..d5493d719d9 100644 --- a/lib/api/services.rb +++ b/lib/api/services.rb @@ -473,7 +473,7 @@ module API desc: 'The description of the tracker' } ], - 'slack-notification' => [ + 'slack' => [ { required: true, name: :webhook, @@ -493,7 +493,7 @@ module API desc: 'The channel name' } ], - 'mattermost-notification' => [ + 'mattermost' => [ { required: true, name: :webhook, |