Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6fc1c6c3
Commit
6fc1c6c3
authored
Nov 06, 2020
by
fjsanpedro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove :generic_canonical feature flag
parent
7b798038
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
32 deletions
+0
-32
app/helpers/page_layout_helper.rb
app/helpers/page_layout_helper.rb
+0
-1
config/feature_flags/development/generic_canonical.yml
config/feature_flags/development/generic_canonical.yml
+0
-7
spec/features/canonical_link_spec.rb
spec/features/canonical_link_spec.rb
+0
-14
spec/helpers/page_layout_helper_spec.rb
spec/helpers/page_layout_helper_spec.rb
+0
-10
No files found.
app/helpers/page_layout_helper.rb
View file @
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
...
...
config/feature_flags/development/generic_canonical.yml
deleted
100644 → 0
View file @
7b798038
---
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
spec/features/canonical_link_spec.rb
View file @
6fc1c6c3
...
@@ -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
spec/helpers/page_layout_helper_spec.rb
View file @
6fc1c6c3
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment