diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-09 18:08:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-09 18:08:56 +0300 |
| commit | 22d08de610d047ae55ab548d8e398b41b4ce28db (patch) | |
| tree | f38716073282e42a009c157418d9ec22527fd753 /app/helpers/page_layout_helper.rb | |
| parent | 0ab6d56c15ebf4a12981556c7d3bc53d9b62cdb9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/page_layout_helper.rb')
| -rw-r--r-- | app/helpers/page_layout_helper.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb index 7630524b545..e39dfa44d86 100644 --- a/app/helpers/page_layout_helper.rb +++ b/app/helpers/page_layout_helper.rb @@ -164,7 +164,6 @@ module PageLayoutHelper strong_memoize(:generic_canonical_url) do next unless request.get? || request.head? next unless generate_generic_canonical_url? - next unless Feature.enabled?(:generic_canonical, current_user) # Request#url builds the url without the trailing slash request.url |