From fbe3bf979d4538d0e7c6284965b6b7e37a708c5e Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Thu, 6 Apr 2017 20:58:36 +0300 Subject: [PATCH] Use layout inheritance in registrar area --- app/controllers/registrar/base_controller.rb | 1 - app/controllers/registrar/sessions_controller.rb | 1 - app/views/layouts/registrar/{application.haml => base.haml} | 0 3 files changed, 2 deletions(-) rename app/views/layouts/registrar/{application.haml => base.haml} (100%) diff --git a/app/controllers/registrar/base_controller.rb b/app/controllers/registrar/base_controller.rb index 0203304c2..c91f2e075 100644 --- a/app/controllers/registrar/base_controller.rb +++ b/app/controllers/registrar/base_controller.rb @@ -1,7 +1,6 @@ class Registrar class BaseController < ApplicationController before_action :authenticate_user!, :check_ip - layout 'registrar/application' include Registrar::ApplicationHelper diff --git a/app/controllers/registrar/sessions_controller.rb b/app/controllers/registrar/sessions_controller.rb index f7fab5ac4..20cde12b7 100644 --- a/app/controllers/registrar/sessions_controller.rb +++ b/app/controllers/registrar/sessions_controller.rb @@ -1,6 +1,5 @@ class Registrar class SessionsController < Devise::SessionsController - layout 'registrar/application' helper_method :depp_controller? def depp_controller? diff --git a/app/views/layouts/registrar/application.haml b/app/views/layouts/registrar/base.haml similarity index 100% rename from app/views/layouts/registrar/application.haml rename to app/views/layouts/registrar/base.haml