diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-14 12:09:14 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-14 12:09:14 +0000 |
commit | 49089d4fb1f5c17328ac61c955d95a68c6d4d545 (patch) | |
tree | 309d97ce6cbc1b22935dd0e11cc72abd767ffcf3 /app/models/service.rb | |
parent | 846a84f2e9d6149b00c63ccae2850421f6766bac (diff) | |
download | gitlab-ce-49089d4fb1f5c17328ac61c955d95a68c6d4d545.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/service.rb')
-rw-r--r-- | app/models/service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/service.rb b/app/models/service.rb index e310ff9abd2..5bbda1500cf 100644 --- a/app/models/service.rb +++ b/app/models/service.rb @@ -12,7 +12,7 @@ class Service < ApplicationRecord ignore_columns %i[title description], remove_with: '13.4', remove_after: '2020-09-22' SERVICE_NAMES = %w[ - alerts asana assembla bamboo bugzilla buildkite campfire custom_issue_tracker discord + alerts asana assembla bamboo bugzilla buildkite campfire confluence custom_issue_tracker discord drone_ci emails_on_push external_wiki flowdock hangouts_chat hipchat irker jira mattermost mattermost_slash_commands microsoft_teams packagist pipelines_email pivotaltracker prometheus pushover redmine slack slack_slash_commands teamcity unify_circuit webex_teams youtrack |