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 /app/models/project.rb | |
| 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 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 48905547ab4..d87fc1e4b86 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -135,6 +135,7 @@ class Project < ActiveRecord::Base # Project services has_one :campfire_service + has_one :discord_service has_one :drone_ci_service has_one :emails_on_push_service has_one :pipelines_email_service |