Merge branch 'zj-remove-deprecated-ci-service' into 'master'

app/models/project_services/gitlab_ci_service.rb

-# 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

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) }

changelogs/unreleased/zj-remove-deprecated-ci-service.yml

+---
+title: Remove deprecated GitlabCiService
+merge_request:
+author:

db/post_migrate/20170214111112_delete_deprecated_gitlab_ci_service.rb

+class DeleteDeprecatedGitlabCiService < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    disable_statement_timeout
+
+    execute("DELETE FROM services WHERE type = 'GitlabCiService';")
+  end
+
+  def down
+    # noop
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170211073944) do
+ActiveRecord::Schema.define(version: 20170214111112) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"