From: Tom Hughes Date: Sun, 1 Nov 2020 14:49:35 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/2923' into master X-Git-Tag: live~1982 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/83c8892c4614bf66e4ecb36deb6b1ef1b21f3187?hp=c8e21c409c9bec446f0caa2526d5b07861bb3299 Merge remote-tracking branch 'upstream/pull/2923' into master --- diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index cb92af8fb..288fb2d5c 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -119,6 +119,10 @@ class UsersController < ApplicationController def account @tokens = current_user.oauth_tokens.authorized + append_content_security_policy_directives( + :form_action => %w[accounts.google.com *.facebook.com login.live.com github.com meta.wikimedia.org] + ) + if params[:user] && params[:user][:display_name] && params[:user][:description] if params[:user][:auth_provider].blank? || (params[:user][:auth_provider] == current_user.auth_provider &&