diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-10-05 12:23:38 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-10-05 12:23:38 -0400 |
| commit | fc59c45d58124c4fc23d62ad2ed65cbfd6cb3563 (patch) | |
| tree | 69f2ac4aaf43599641a395c6f936e717ff3f5d02 /app/controllers/ci | |
| parent | 8a78c4ea06c7bd3a4c6a0ea9943891327b90cd35 (diff) | |
| download | gitlab-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 'app/controllers/ci')
| -rw-r--r-- | app/controllers/ci/application_controller.rb | 9 | ||||
| -rw-r--r-- | app/controllers/ci/projects_controller.rb | 8 |
2 files changed, 2 insertions, 15 deletions
diff --git a/app/controllers/ci/application_controller.rb b/app/controllers/ci/application_controller.rb index d8227e632e4..9be470660e6 100644 --- a/app/controllers/ci/application_controller.rb +++ b/app/controllers/ci/application_controller.rb @@ -1,7 +1,5 @@ module Ci class ApplicationController < ::ApplicationController - before_action :check_enable_flag! - def self.railtie_helpers_paths "app/helpers/ci" end @@ -10,13 +8,6 @@ module Ci 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! diff --git a/app/controllers/ci/projects_controller.rb b/app/controllers/ci/projects_controller.rb index e8788955eba..82fb14c4276 100644 --- a/app/controllers/ci/projects_controller.rb +++ b/app/controllers/ci/projects_controller.rb @@ -3,17 +3,13 @@ module Ci 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] - - def disabled - end + layout 'ci/project', except: [:index] def show @ref = params[:ref] |