From ae0ad771975075756bcd0c2cba3496112731a4de Mon Sep 17 00:00:00 2001
From: rgarcia <voodoorai2000@gmail.com>
Date: Thu, 3 Sep 2015 01:28:46 +0200
Subject: [PATCH] reorders before_actions

---
 app/controllers/application_controller.rb | 29 ++++++++++-------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 86219f0ad..d5b05c6ae 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,31 +1,28 @@
 require "application_responder"
 
 class ApplicationController < ActionController::Base
+  include SimpleCaptcha::ControllerHelpers
   include HasFilters
 
-  before_filter :authenticate_http_basic
-
-  before_filter :authenticate_user!, unless: :devise_controller?, if: :beta_site?
-  before_filter :authenticate_beta_tester!, unless: :devise_controller?, if: :beta_site?
-
-  check_authorization unless: :devise_controller?
-  include SimpleCaptcha::ControllerHelpers
-  self.responder = ApplicationResponder
-  respond_to :html
-
-  before_action :set_locale
-  layout :set_layout
-
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
-  protect_from_forgery with: :exception
+  before_action :authenticate_http_basic
+  before_action :authenticate_user!, unless: :devise_controller?, if: :beta_site?
+  before_action :authenticate_beta_tester!, unless: :devise_controller?, if: :beta_site?
 
   before_action :ensure_signup_complete
+  before_action :set_locale
+
+  check_authorization unless: :devise_controller?
+  self.responder = ApplicationResponder
+
+  protect_from_forgery with: :exception
 
   rescue_from CanCan::AccessDenied do |exception|
     redirect_to main_app.root_url, alert: exception.message
   end
 
+  layout :set_layout
+  respond_to :html
+
   private
 
     def authenticate_http_basic