summaryrefslogtreecommitdiff
path: root/lib/ci
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-10-05 20:06:31 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2015-10-05 20:06:31 +0200
commitf088ffe8f7a8b9ef429f2fb0fbdfd45fa37cde20 (patch)
treed3bf78bcd464177800cfd466f9ebda114e8d8a71 /lib/ci
parent3eef0e18e0d4561c320b4a5d9c17d7ae7aaa3d42 (diff)
parentfc59c45d58124c4fc23d62ad2ed65cbfd6cb3563 (diff)
downloadgitlab-ce-f088ffe8f7a8b9ef429f2fb0fbdfd45fa37cde20.tar.gz
Merge branch 'rs-remove-ci-disable'
See merge request !1512
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