From ae21209920fc5b20566e0b0a6260e906f65ac6b4 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Mon, 17 Aug 2015 13:20:52 +0200
Subject: [PATCH] Moves the layout to admin::BaseController and
 moderation::BaseController

---
 app/controllers/admin/base_controller.rb      | 4 +++-
 app/controllers/admin/tags_controller.rb      | 1 -
 app/controllers/moderation/base_controller.rb | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb
index f4322efe7..81ec67996 100644
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@@ -1,4 +1,6 @@
 class Admin::BaseController < ApplicationController
+  layout 'admin'
+
   before_action :authenticate_user!
 
   skip_authorization_check
@@ -10,4 +12,4 @@ class Admin::BaseController < ApplicationController
       raise CanCan::AccessDenied unless current_user.try(:administrator?)
     end
 
-end
\ No newline at end of file
+end
diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb
index ecacdbdb2..03cfeb64f 100644
--- a/app/controllers/admin/tags_controller.rb
+++ b/app/controllers/admin/tags_controller.rb
@@ -1,5 +1,4 @@
 class Admin::TagsController < Admin::BaseController
-  layout 'admin'
   before_action :find_tag, only: [:update, :destroy]
 
   respond_to :html, :js
diff --git a/app/controllers/moderation/base_controller.rb b/app/controllers/moderation/base_controller.rb
index 0ee155e03..f2a794526 100644
--- a/app/controllers/moderation/base_controller.rb
+++ b/app/controllers/moderation/base_controller.rb
@@ -1,4 +1,6 @@
 class Moderation::BaseController < ApplicationController
+  layout 'admin'
+
   before_action :authenticate_user!
 
   skip_authorization_check