From 22d08de610d047ae55ab548d8e398b41b4ce28db Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 9 Nov 2020 15:08:56 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/helpers/page_layout_helper.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app/helpers/page_layout_helper.rb')

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
-- 
cgit v1.2.3