Remove the option to disable CI

This option only existed to ease the CI-to-CE/EE migration process. This commit partially reverts 8b05abe8

Remove the option to disable CI
This option only existed to ease the CI-to-CE/EE migration process. This commit partially reverts 8b05abe8
fc59c45d · Robert Speicher · 8a78c4ea · fc59c45d · fc59c45d · fc59c45d
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -56,7 +56,6 @@ def application_setting_params
      :restricted_signup_domains_raw,
      :version_check_enabled,
      :user_oauth_applications,
-      :ci_enabled,
      restricted_visibility_levels: [],
      import_sources: []
    )

--- a/app/controllers/ci/application_controller.rb
+++ b/app/controllers/ci/application_controller.rb
 module Ci
  class ApplicationController < ::ApplicationController
-    before_action :check_enable_flag!
    def self.railtie_helpers_paths
      "app/helpers/ci"
    end
@@ -10,13 +8,6 @@ def self.railtie_helpers_paths
    private
-    def check_enable_flag!
-      unless current_application_settings.ci_enabled
-        redirect_to(disabled_ci_projects_path)
-        return
-      end
-    end
    def authenticate_public_page!
      unless project.public
        authenticate_user!

--- a/app/controllers/ci/projects_controller.rb
+++ b/app/controllers/ci/projects_controller.rb
@@ -3,17 +3,13 @@ class ProjectsController < Ci::ApplicationController
    before_action :authenticate_user!, except: [:build, :badge, :show]
    before_action :authenticate_public_page!, only: :show
    before_action :project, only: [:build, :show, :badge, :toggle_shared_runners, :dumped_yaml]
-    before_action :authorize_access_project!, except: [:build, :badge, :show, :new, :disabled]
+    before_action :authorize_access_project!, except: [:build, :badge, :show, :new]
    before_action :authorize_manage_project!, only: [:toggle_shared_runners, :dumped_yaml]
    before_action :authenticate_token!, only: [:build]
    before_action :no_cache, only: [:badge]
-    skip_before_action :check_enable_flag!, only: [:disabled]
    protect_from_forgery except: :build
-    layout 'ci/project', except: [:index, :disabled]
+    layout 'ci/project', except: [:index]
-    def disabled
-    end
    def show
      @ref = params[:ref]

--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -83,8 +83,7 @@ def self.create_from_defaults
      default_project_visibility: Settings.gitlab.default_projects_features['visibility_level'],
      default_snippet_visibility: Settings.gitlab.default_projects_features['visibility_level'],
      restricted_signup_domains: Settings.gitlab['restricted_signup_domains'],
-      import_sources: ['github','bitbucket','gitlab','gitorious','google_code','fogbugz','git'],
+      import_sources: ['github','bitbucket','gitlab','gitorious','google_code','fogbugz','git']
-      ci_enabled: Settings.gitlab_ci['enabled']
    )
  end

--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -124,14 +124,5 @@
        = f.text_area :help_page_text, class: 'form-control', rows: 4
        .help-block Markdown enabled
-  %fieldset
-    %legend Continuous Integration
-    .form-group
-      .col-sm-offset-2.col-sm-10
-        .checkbox
-          = f.label :ci_enabled do
-            = f.check_box :ci_enabled
-            Disable to prevent CI usage until rake ci:migrate is run (8.0 only)
  .form-actions
    = f.submit 'Save', class: 'btn btn-primary'
--- a/app/views/ci/projects/disabled.html.haml
+++ b/app/views/ci/projects/disabled.html.haml
-Continuous Integration has been disabled for time of the migration.
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -178,7 +178,6 @@ def base_gitlab_url
 # CI
 #
 Settings['gitlab_ci'] ||= Settingslogic.new({})
-Settings.gitlab_ci['enabled']             = true if Settings.gitlab_ci['enabled'].nil?
 Settings.gitlab_ci['all_broken_builds']   = true if Settings.gitlab_ci['all_broken_builds'].nil?
 Settings.gitlab_ci['add_pusher']          = false if Settings.gitlab_ci['add_pusher'].nil?
 Settings.gitlab_ci['url']                 ||= Settings.send(:build_gitlab_ci_url)

--- a/db/migrate/20151005162154_remove_ci_enabled_from_application_settings.rb
+++ b/db/migrate/20151005162154_remove_ci_enabled_from_application_settings.rb
+class RemoveCiEnabledFromApplicationSettings < ActiveRecord::Migration
+  def change
+    remove_column :application_settings, :ci_enabled, :boolean, null: false, default: true
+  end
+end
--- a/db/schema.rb
+++ b/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: 20150930095736) do
+ActiveRecord::Schema.define(version: 20151005162154) do
  # These are extensions that must be enabled in order to support this database
  enable_extension "plpgsql"
@@ -46,7 +46,6 @@
    t.integer  "session_expire_delay",         default: 10080, null: false
    t.text     "import_sources"
    t.text     "help_page_text"
-    t.boolean  "ci_enabled",                   default: true,  null: false
  end
  create_table "audit_events", force: true do |t|

--- a/lib/ci/api/api.rb
+++ b/lib/ci/api/api.rb
@@ -23,10 +23,6 @@ class API < Grape::API
        rack_response({ 'message' => '500 Internal Server Error' }, 500)
      end
-      before do
-        check_enable_flag!
-      end
      format :json
      helpers Helpers

--- a/lib/ci/api/helpers.rb
+++ b/lib/ci/api/helpers.rb
@@ -3,12 +3,6 @@ module API
    module Helpers
      UPDATE_RUNNER_EVERY = 60
-      def check_enable_flag!
-        unless current_application_settings.ci_enabled
-          render_api_error!('400 (Bad request) CI is disabled', 400)
-        end
-      end
      def authenticate_runners!
        forbidden! unless params[:token] == GitlabCi::REGISTRATION_TOKEN
      end