Initial Rails 4.0.x upgrade

This commit is contained in:
Al Snow
2014-09-07 13:00:54 -04:00
parent ecb2ec612e
commit 23513cf8d2
18 changed files with 125 additions and 123 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
class AdminController < ApplicationController
before_filter :administrative, :if => :admin_param, :except => [:get_user]
before_action :administrative, :if => :admin_param, :except => [:get_user]
skip_before_filter :has_info
def dashboard
+1 -1
View File
@@ -1,5 +1,5 @@
class ApplicationController < ActionController::Base
before_filter :authenticated, :has_info, :create_analytic, :mailer_options
before_action :authenticated, :has_info, :create_analytic, :mailer_options
helper_method :current_user, :is_admin?, :sanitize_font
# Our security guy keep talking about sea-surfing, cool story bro.