summaryrefslogtreecommitdiff
path: root/lib/ci
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-10-05 12:23:38 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-10-05 12:23:38 -0400
commitfc59c45d58124c4fc23d62ad2ed65cbfd6cb3563 (patch)
tree69f2ac4aaf43599641a395c6f936e717ff3f5d02 /lib/ci
parent8a78c4ea06c7bd3a4c6a0ea9943891327b90cd35 (diff)
downloadgitlab-ce-fc59c45d58124c4fc23d62ad2ed65cbfd6cb3563.tar.gz
Remove the option to disable CIrs-remove-ci-disable
This option only existed to ease the CI-to-CE/EE migration process. This commit partially reverts 8b05abe816b0c681ac218096b294311dd04fde8b
Diffstat (limited to 'lib/ci')
-rw-r--r--lib/ci/api/api.rb4
-rw-r--r--lib/ci/api/helpers.rb6
2 files changed, 0 insertions, 10 deletions
diff --git a/lib/ci/api/api.rb b/lib/ci/api/api.rb
index 5109c84e0ea..218d8c3adcc 100644
--- a/lib/ci/api/api.rb
+++ b/lib/ci/api/api.rb
@@ -23,10 +23,6 @@ module Ci
rack_response({ 'message' => '500 Internal Server Error' }, 500)
end
- before do
- check_enable_flag!
- end
-
format :json
helpers Helpers
diff --git a/lib/ci/api/helpers.rb b/lib/ci/api/helpers.rb
index 8e893aa5cc6..e602cda81d6 100644
--- a/lib/ci/api/helpers.rb
+++ b/lib/ci/api/helpers.rb
@@ -3,12 +3,6 @@ module Ci
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