diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-04-06 19:37:25 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-04-06 19:37:25 +0000 |
commit | 00e00cacf8cb4ce3bfb733bae47e7e594e91e294 (patch) | |
tree | 607671987a66dbb16d49738aef22616c13b6936b /app/models/project.rb | |
parent | 73cb71e41c0ade92b9673a5d74c7dd78679fae91 (diff) | |
parent | 1f404065ca602593dc18aa051515fd88132ddfdf (diff) | |
download | gitlab-ce-00e00cacf8cb4ce3bfb733bae47e7e594e91e294.tar.gz |
Merge branch 'microsoft-teams-integration' into 'master'
adds initial microsoft teams integration
See merge request !10412
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 c1909c6d4a8..19835a72a75 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -116,6 +116,7 @@ class Project < ActiveRecord::Base has_one :mock_ci_service, dependent: :destroy has_one :mock_deployment_service, dependent: :destroy has_one :mock_monitoring_service, dependent: :destroy + has_one :microsoft_teams_service, dependent: :destroy has_one :forked_project_link, dependent: :destroy, foreign_key: "forked_to_project_id" has_one :forked_from_project, through: :forked_project_link |