Merge remote-tracking branch 'upstream/pull/2116'

[rails.git] / app / controllers / directions_controller.rb

diff --git a/app/controllers/directions_controller.rb b/app/controllers/directions_controller.rb
index d153f03205bff148a98c0f9f30bd2eaa03d90fe0..ec23274006b8062d30bc84dda00752d4d9cfd54f 100644 (file)
--- a/app/controllers/directions_controller.rb
+++ b/app/controllers/directions_controller.rb
@@ -1,7 +1,8 @@
 class DirectionsController < ApplicationController
 class DirectionsController < ApplicationController

-  before_filter :authorize_web
-  before_filter :set_locale
-  before_filter :require_oauth, :only => [:search]
+  before_action :authorize_web
+  before_action :set_locale
+  before_action :require_oauth, :only => [:search]
+  authorize_resource :class => false

 
   def search
     render :layout => map_layout
 
   def search
     render :layout => map_layout