Merged r22070 from trunk to 4.2-stable (#38201).

git-svn-id: https://svn.redmine.org/redmine/branches/4.2-stable@22073 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/welcome/robots.text.erb b/app/views/welcome/robots.text.erb
index a13cdc85e8107044c368091ab659aa23bbef296b..e4ce3dbcb7269de21f723c5a31af5675f4c5b2b7 100644 (file)
--- a/app/views/welcome/robots.text.erb
+++ b/app/views/welcome/robots.text.erb
@@ -10,8 +10,8 @@ Disallow: <%= url_for(issues_gantt_path) %>
 Disallow: <%= url_for(issues_calendar_path) %>
 Disallow: <%= url_for(activity_path) %>
 Disallow: <%= url_for(search_path) %>
-Disallow: <%= url_for(issues_path(:sort => '')) %>
-Disallow: <%= url_for(issues_path(:query_id => '')) %>
+Disallow: <%= url_for(issues_path) %>?*sort=
+Disallow: <%= url_for(issues_path) %>?*query_id=
 Disallow: <%= url_for(issues_path) %>?*set_filter=
 Disallow: <%= url_for(issues_path(:trailing_slash => true)) %>*.pdf$
 Disallow: <%= url_for(projects_path(:trailing_slash => true)) %>*.pdf$

diff --git a/test/integration/welcome_test.rb b/test/integration/welcome_test.rb
index 89fe1691f3f4d28c7d4b70c12791924f3724960c..2d360dd8b3d87c15696d4740c0b5e83dfa935f84 100644 (file)
--- a/test/integration/welcome_test.rb
+++ b/test/integration/welcome_test.rb
@@ -29,7 +29,7 @@ class WelcomeTest < Redmine::IntegrationTest
     assert_equal 'text/plain', @response.media_type
     # Redmine::Utils.relative_url_root does not effect on Rails 5.1.4.
     assert @response.body.match(%r{^Disallow: /projects/ecookbook/issues\r?$})
-    assert @response.body.match(%r{^Disallow: /issues\?sort=\r?$})
+    assert @response.body.match(%r{^Disallow: /issues\?\*sort=\r?$})
     assert @response.body.match(%r{^Disallow: /issues\?\*set_filter=\r?$})
     assert @response.body.match(%r{^Disallow: /issues/\*\.pdf\$\r?$})
     assert @response.body.match(%r{^Disallow: /projects/\*\.pdf\$\r?$})