Commit c88d9aa6 authored by Jan Provaznik's avatar Jan Provaznik

Merge branch '277352-fj-remove-generic-canonial-feature-flag' into 'master'

Remove :generic_canonical feature flag

See merge request gitlab-org/gitlab!47053
parents 7f95f25e 6fc1c6c3
...@@ -164,7 +164,6 @@ module PageLayoutHelper ...@@ -164,7 +164,6 @@ module PageLayoutHelper
strong_memoize(:generic_canonical_url) do strong_memoize(:generic_canonical_url) do
next unless request.get? || request.head? next unless request.get? || request.head?
next unless generate_generic_canonical_url? 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 builds the url without the trailing slash
request.url request.url
......
---
name: generic_canonical
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46435
rollout_issue_url:
type: development
group: group::editor
default_enabled: false
...@@ -67,18 +67,4 @@ RSpec.describe 'Canonical link' do ...@@ -67,18 +67,4 @@ RSpec.describe 'Canonical link' do
let(:request_url) { explore_root_path } let(:request_url) { explore_root_path }
let(:expected_url) { explore_projects_url } let(:expected_url) { explore_projects_url }
end end
context 'when feature flag generic_canonical is disabled' do
before do
stub_feature_flags(generic_canonical: false)
end
it_behaves_like 'does not show canonical link' do
let(:request_url) { issue_request + '/' }
end
it_behaves_like 'does not show canonical link' do
let(:request_url) { project_request + '/' }
end
end
end end
...@@ -196,16 +196,6 @@ RSpec.describe PageLayoutHelper do ...@@ -196,16 +196,6 @@ RSpec.describe PageLayoutHelper do
it_behaves_like 'does not return a canonical url' do it_behaves_like 'does not return a canonical url' do
let(:method) { 'PUT' } let(:method) { 'PUT' }
end end
context 'when feature flag generic_canonical is disabled' do
let(:method) { 'GET' }
before do
stub_feature_flags(generic_canonical: false)
end
it_behaves_like 'does not return a canonical url'
end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment