diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-26 09:06:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-26 09:06:35 +0300 |
| commit | 71c6369c63c3b0576c79f2c9b4ba977aded8de7a (patch) | |
| tree | 591bacb9183098ed90a2afabccd517f9b79b9d87 /app | |
| parent | 693cbd0f88c279cf1dbf4997dd8914c720cdd32c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/concerns/routable_actions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/routable_actions.rb b/app/controllers/concerns/routable_actions.rb index 45f9888a040..1b2e6461dee 100644 --- a/app/controllers/concerns/routable_actions.rb +++ b/app/controllers/concerns/routable_actions.rb @@ -47,7 +47,7 @@ module RoutableActions canonical_path = routable.full_path if canonical_path != requested_full_path - if canonical_path.casecmp(requested_full_path) != 0 + if !request.xhr? && request.format.html? && canonical_path.casecmp(requested_full_path) != 0 flash[:notice] = "#{routable.class.to_s.titleize} '#{requested_full_path}' was moved to '#{canonical_path}'. Please update any links and bookmarks that may still have the old path." end |