Merged r19844 from trunk to 4.1-stable (#6734).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19852 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/welcome/robots.text.erb b/app/views/welcome/robots.text.erb
index 6f66278ad984d9687e0f9abbd66983b0ae708bca..16acc8111582cc45fa8cc3375c99f511412f5e06 100644 (file)
--- a/app/views/welcome/robots.text.erb
+++ b/app/views/welcome/robots.text.erb
@@ -10,3 +10,6 @@ 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) %>?*set_filter=

diff --git a/test/integration/welcome_test.rb b/test/integration/welcome_test.rb
index cd4159d9a44a37b28f5ad3fe31926cb4f616f22a..653f1751b8dcb4a18d1f792853c01eed745500d2 100644 (file)
--- a/test/integration/welcome_test.rb
+++ b/test/integration/welcome_test.rb
@@ -29,5 +29,7 @@ class WelcomeTest < Redmine::IntegrationTest
     assert_equal 'text/plain', @response.content_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\?\*set_filter=\r?$})
   end
 end