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

diff --cc config/routes.rb
Simple merge

diff --cc test/controllers/users_controller_test.rb
index 7b554711f6e7dc28f52e4d695817332aba618d65,10875b068b9d586c8c81ae38b438364d3ad33447..e021513da6fdce0552c09900c6f10b7cb2d21bb8
--- 1/test/controllers/users_controller_test.rb
--- 2/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@@ -50,15 -50,13 +50,15 @@@ class UsersControllerTest < ActionDispa
    end
  
    # The user creation page loads
-   def test_new_view
-     get user_new_path
-     assert_redirected_to user_new_path(:cookie_test => "true")
+   def test_new
+     get new_user_path
+     assert_redirected_to new_user_path(:cookie_test => "true")
  
-     get user_new_path, :params => { :cookie_test => "true" }
+     get new_user_path, :params => { :cookie_test => "true" }
      assert_response :success
  
 +    assert_no_match(/img-src \* data:;/, @response.headers["Content-Security-Policy-Report-Only"])
 +
      assert_select "html", :count => 1 do
        assert_select "head", :count => 1 do
          assert_select "title", :text => /Sign Up/, :count => 1