diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-02-14 15:15:41 +0100 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-02-14 15:15:41 +0100 |
| commit | 178b6014f856dbca1653961a1f8341d7d1d38d2f (patch) | |
| tree | 35b0f37d56c561467cb51f23050f1795d8c0aa5b /app/models | |
| parent | 865e3fcc13834a1503b8a6c3f7cc7826bacdcc9f (diff) | |
| download | gitlab-ce-178b6014f856dbca1653961a1f8341d7d1d38d2f.tar.gz | |
Remove deprecated CI service
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project_services/gitlab_ci_service.rb | 8 | ||||
| -rw-r--r-- | app/models/service.rb | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/app/models/project_services/gitlab_ci_service.rb b/app/models/project_services/gitlab_ci_service.rb deleted file mode 100644 index bbc312f5215..00000000000 --- a/app/models/project_services/gitlab_ci_service.rb +++ /dev/null @@ -1,8 +0,0 @@ -# TODO(ayufan): The GitLabCiService is deprecated and the type should be removed when the database entries are removed -class GitlabCiService < CiService - # We override the active accessor to always make GitLabCiService disabled - # Otherwise the GitLabCiService can be picked, but should never be since it's deprecated - def active - false - end -end diff --git a/app/models/service.rb b/app/models/service.rb index 043be222f3a..facaaf9b331 100644 --- a/app/models/service.rb +++ b/app/models/service.rb @@ -27,7 +27,7 @@ class Service < ActiveRecord::Base validates :project_id, presence: true, unless: Proc.new { |service| service.template? } - scope :visible, -> { where.not(type: ['GitlabIssueTrackerService', 'GitlabCiService']) } + scope :visible, -> { where.not(type: 'GitlabIssueTrackerService') } scope :issue_trackers, -> { where(category: 'issue_tracker') } scope :external_wikis, -> { where(type: 'ExternalWikiService').active } scope :active, -> { where(active: true) } |