X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dc2a2c8ebd1a11e4a64555fda22c6859a51defff..fe77d0daa1047767e374494063073d46a059f0b2:/app/controllers/application_controller.rb?ds=sidebyside diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 43afdf74f..618f08a1f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -3,7 +3,7 @@ class ApplicationController < ActionController::Base protect_from_forgery - before_filter :fetch_body + before_action :fetch_body def authorize_web if session[:user] @@ -272,7 +272,7 @@ class ApplicationController < ActionController::Base # phrase from that, we can also put the error message into the status # message. For now, rails won't let us) def report_error(message, status = :bad_request) - # Todo: some sort of escaping of problem characters in the message + # TODO: some sort of escaping of problem characters in the message response.headers["Error"] = message if request.headers["X-Error-Format"] && @@ -389,12 +389,6 @@ class ApplicationController < ActionController::Base render :action => "timeout" end - ## - # is the requestor logged in? - def logged_in? - !@user.nil? - end - ## # ensure that there is a "this_user" instance variable def lookup_this_user