Remove Ci::ApplicationController

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-07 01:01:32 +09:00 · 2016-10-07 01:01:32 +09:00 · 36bf0b67e5
parent 516d869e09
commit 36bf0b67e5
4 changed files with 3 additions and 9 deletions
--- a/1
+++ b/1
@ -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)
--- a/app/controllers/ci/application_controller.rb
+++ b/app/controllers/ci/application_controller.rb
@ -1,7 +0,0 @@
-module Ci
-  class ApplicationController < ::ApplicationController
-    def self.railtie_helpers_paths
-      "app/helpers/ci"
-    end
-  end
-end
--- 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
--- 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]