X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/326d4ecec0ca0817567912f5d45b904df4c5b054..be11f2075e8bbde0a1e0640fd254c64ee0c94f25:/app/controllers/application_controller.rb?ds=sidebyside diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 32b53bad7..25c430f1c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -20,7 +20,7 @@ class ApplicationController < ActionController::Base helper_method :oauth_token def self.allow_thirdparty_images(**options) - content_security_policy(options) do |policy| + content_security_policy(**options) do |policy| policy.img_src("*", :data) end end @@ -56,11 +56,11 @@ class ApplicationController < ActionController::Base # don't allow access to any auth-requiring part of the site unless # the new CTs have been seen (and accept/decline chosen). elsif !current_user.terms_seen && flash[:skip_terms].nil? - flash[:notice] = t "users.terms.you need to accept or decline" + flash[:notice] = t "accounts.terms.show.you need to accept or decline" if params[:referer] - redirect_to :controller => "users", :action => "terms", :referer => params[:referer] + redirect_to account_terms_path(:referer => params[:referer]) else - redirect_to :controller => "users", :action => "terms", :referer => request.fullpath + redirect_to account_terms_path(:referer => request.fullpath) end end end