diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-04-20 11:10:00 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-04-20 11:10:00 +0200 |
| commit | 27cc95ab499c08b634990b4c9266bb5ac6b64734 (patch) | |
| tree | 6a401b3d11fd6f7728253dca2e0c2e31548808ed /app/models/service.rb | |
| parent | 5e2219db48719af5ca971f9222fffa7bd66cb6d8 (diff) | |
| parent | 08b2e7cd8f69603075edcb93a6a66b6407beb700 (diff) | |
| download | gitlab-ce-27cc95ab499c08b634990b4c9266bb5ac6b64734.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 26914-add_deploy_history_data_source
Diffstat (limited to 'app/models/service.rb')
| -rw-r--r-- | app/models/service.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/models/service.rb b/app/models/service.rb index e73f7e5d1a3..dc76bf925d3 100644 --- a/app/models/service.rb +++ b/app/models/service.rb @@ -25,7 +25,7 @@ class Service < ActiveRecord::Base belongs_to :project, inverse_of: :services has_one :service_hook - validates :project_id, presence: true, unless: Proc.new { |service| service.template? } + validates :project_id, presence: true, unless: proc { |service| service.template? } scope :visible, -> { where.not(type: 'GitlabIssueTrackerService') } scope :issue_trackers, -> { where(category: 'issue_tracker') } @@ -237,8 +237,11 @@ class Service < ActiveRecord::Base slack_slash_commands slack teamcity + microsoft_teams ] - service_names << 'mock_ci' if Rails.env.development? + if Rails.env.development? + service_names += %w[mock_ci mock_deployment mock_monitoring] + end service_names.sort_by(&:downcase) end |