diff options
| author | Go MAEDA <maeda@farend.jp> | 2023-01-23 23:44:25 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2023-01-23 23:44:25 +0000 |
| commit | c3fe75fc250eb1c4f5bd42348c4b5013de77c90a (patch) | |
| tree | 494075c8006a8d2a1b6b0ba3600b188cc47d9105 | |
| parent | 4d5d735c76f7e774e9c8b41eced49a8abbfa9c8b (diff) | |
| download | redmine-c3fe75fc250eb1c4f5bd42348c4b5013de77c90a.tar.gz redmine-c3fe75fc250eb1c4f5bd42348c4b5013de77c90a.zip | |
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
| -rw-r--r-- | app/views/welcome/robots.text.erb | 4 | ||||
| -rw-r--r-- | test/integration/welcome_test.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/welcome/robots.text.erb b/app/views/welcome/robots.text.erb index a13cdc85e..e4ce3dbcb 100644 --- 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 89fe1691f..2d360dd8b 100644 --- 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?$}) |