diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-10 16:47:48 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-10 16:47:48 +0200 |
| commit | b06acbf52d76e36f55dcee5dd9935b43f1b7bbd2 (patch) | |
| tree | d72ba17b653b7aa37e03bb52078304cfcf635f80 | |
| parent | 516d869e091296ef6e3bebd8e083c49ef71e2ea1 (diff) | |
| parent | 36bf0b67e56af452b6a4ba9b03a1ee684cab2a78 (diff) | |
| download | gitlab-ce-b06acbf52d76e36f55dcee5dd9935b43f1b7bbd2.tar.gz | |
Merge branch 'tnir/gitlab-ce-23068-cleanup-ci-application-controller'
Remove Ci::ApplicationController.
See gitlab-org/gitlab-ce!6757.
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/controllers/ci/application_controller.rb | 7 | ||||
| -rw-r--r-- | app/controllers/ci/lints_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/ci/projects_controller.rb | 2 |
4 files changed, 3 insertions, 9 deletions
diff --git a/CHANGELOG b/CHANGELOG index 26ec441c27f..7081dfacace 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -82,6 +82,7 @@ v 8.13.0 (unreleased) - Retouch environments list and deployments list - Add Container Registry on/off status to Admin Area !6638 (the-undefined) - Grouped pipeline dropdown is a scrollable container + - Cleanup Ci::ApplicationController. !6757 (Takuya Noguchi) - Fix a typo in doc/api/labels.md v 8.12.5 (unreleased) diff --git a/app/controllers/ci/application_controller.rb b/app/controllers/ci/application_controller.rb deleted file mode 100644 index 5bb7d499cdc..00000000000 --- a/app/controllers/ci/application_controller.rb +++ /dev/null @@ -1,7 +0,0 @@ -module Ci - class ApplicationController < ::ApplicationController - def self.railtie_helpers_paths - "app/helpers/ci" - end - end -end diff --git a/app/controllers/ci/lints_controller.rb b/app/controllers/ci/lints_controller.rb index 78012960252..3eb485de9db 100644 --- a/app/controllers/ci/lints_controller.rb +++ b/app/controllers/ci/lints_controller.rb @@ -1,5 +1,5 @@ module Ci - class LintsController < ApplicationController + class LintsController < ::ApplicationController before_action :authenticate_user! def show diff --git a/app/controllers/ci/projects_controller.rb b/app/controllers/ci/projects_controller.rb index aa894fde36b..ff297d6ff13 100644 --- a/app/controllers/ci/projects_controller.rb +++ b/app/controllers/ci/projects_controller.rb @@ -1,5 +1,5 @@ module Ci - class ProjectsController < Ci::ApplicationController + class ProjectsController < ::ApplicationController before_action :project before_action :no_cache, only: [:badge] before_action :authorize_read_project!, except: [:badge, :index] |