diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-10-30 14:41:16 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-10-30 14:41:16 +0100 |
| commit | 8146271d4043a91e8f65c7af41c6c015e7d155c3 (patch) | |
| tree | da09375c00d7931656cc790f053adf904d50c01e /app/models/project.rb | |
| parent | 57471894819c07796d2aa04e5a21d1a648a7751e (diff) | |
| parent | 8388bbe82918d2fca2600620f48e048ccfab2c97 (diff) | |
| download | gitlab-ce-8146271d4043a91e8f65c7af41c6c015e7d155c3.tar.gz | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup_restore_drop_sequences
Conflicts:
CHANGELOG
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 613f98ba44b..c58c9b551c9 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -65,6 +65,7 @@ class Project < ActiveRecord::Base has_one :gemnasium_service, dependent: :destroy has_one :slack_service, dependent: :destroy has_one :buildbox_service, dependent: :destroy + has_one :bamboo_service, dependent: :destroy has_one :pushover_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 @@ -313,7 +314,7 @@ class Project < ActiveRecord::Base end def available_services_names - %w(gitlab_ci campfire hipchat pivotaltracker flowdock assembla emails_on_push gemnasium slack pushover buildbox) + %w(gitlab_ci campfire hipchat pivotaltracker flowdock assembla emails_on_push gemnasium slack pushover buildbox bamboo) end def gitlab_ci? |