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
44cdee05
Commit
44cdee05
authored
Nov 11, 2020
by
fjsanpedro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove epic check generating sitemap
parent
0f6b61e6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
14 deletions
+8
-14
ee/changelogs/unreleased/fj-remove-epic-check-in-sitemap.yml
ee/changelogs/unreleased/fj-remove-epic-check-in-sitemap.yml
+5
-0
ee/lib/gitlab/sitemaps/url_extractor.rb
ee/lib/gitlab/sitemaps/url_extractor.rb
+3
-4
ee/spec/lib/gitlab/sitemaps/url_extractor_spec.rb
ee/spec/lib/gitlab/sitemaps/url_extractor_spec.rb
+0
-10
No files found.
ee/changelogs/unreleased/fj-remove-epic-check-in-sitemap.yml
0 → 100644
View file @
44cdee05
---
title
:
Remove epic check generating sitemap
merge_request
:
47381
author
:
type
:
changed
ee/lib/gitlab/sitemaps/url_extractor.rb
View file @
44cdee05
...
@@ -25,10 +25,9 @@ module Gitlab
...
@@ -25,10 +25,9 @@ module Gitlab
"
#{
base_url
}#{
full_path
}
"
,
"
#{
base_url
}#{
full_path
}
"
,
"
#{
base_url
}
groups/
#{
full_path
}
/-/issues"
,
"
#{
base_url
}
groups/
#{
full_path
}
/-/issues"
,
"
#{
base_url
}
groups/
#{
full_path
}
/-/merge_requests"
,
"
#{
base_url
}
groups/
#{
full_path
}
/-/merge_requests"
,
"
#{
base_url
}
groups/
#{
full_path
}
/-/packages"
"
#{
base_url
}
groups/
#{
full_path
}
/-/packages"
,
].
tap
do
|
urls
|
"
#{
base_url
}
groups/
#{
full_path
}
/-/epics"
urls
<<
"
#{
base_url
}
groups/
#{
full_path
}
/-/epics"
if
group
.
feature_available?
(
:epics
)
]
end
end
end
def
extract_from_project
(
project
)
def
extract_from_project
(
project
)
...
...
ee/spec/lib/gitlab/sitemaps/url_extractor_spec.rb
View file @
44cdee05
...
@@ -55,8 +55,6 @@ RSpec.describe Gitlab::Sitemaps::UrlExtractor do
...
@@ -55,8 +55,6 @@ RSpec.describe Gitlab::Sitemaps::UrlExtractor do
subject
{
described_class
.
extract_from_group
(
group
)
}
subject
{
described_class
.
extract_from_group
(
group
)
}
it
'returns several group urls'
do
it
'returns several group urls'
do
stub_licensed_features
(
epics:
true
)
expected_urls
=
[
expected_urls
=
[
group_url
(
group
),
group_url
(
group
),
issues_group_url
(
group
),
issues_group_url
(
group
),
...
@@ -67,14 +65,6 @@ RSpec.describe Gitlab::Sitemaps::UrlExtractor do
...
@@ -67,14 +65,6 @@ RSpec.describe Gitlab::Sitemaps::UrlExtractor do
expect
(
subject
).
to
match_array
(
expected_urls
)
expect
(
subject
).
to
match_array
(
expected_urls
)
end
end
context
'when epics are not enabled'
do
it
'does nor include epics url'
do
stub_licensed_features
(
epics:
false
)
expect
(
subject
).
not_to
include
(
group_epics_url
(
group
))
end
end
end
end
describe
'.extract_from_project'
do
describe
'.extract_from_project'
do
...
...
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