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
08d1433e
Commit
08d1433e
authored
Apr 21, 2021
by
Vladimir Shushlin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove pages_serve_with_zip_file_protocol feature flag
It was enabled by default in 13.11, so we can remove int 13.12
parent
95638a05
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
25 deletions
+8
-25
app/models/pages/lookup_path.rb
app/models/pages/lookup_path.rb
+0
-2
changelogs/unreleased/321677-enable-and-remove-pages_serve_with_zip_file_protocol-feature-flag.yml
...emove-pages_serve_with_zip_file_protocol-feature-flag.yml
+5
-0
config/feature_flags/development/pages_serve_with_zip_file_protocol.yml
..._flags/development/pages_serve_with_zip_file_protocol.yml
+0
-8
spec/models/pages/lookup_path_spec.rb
spec/models/pages/lookup_path_spec.rb
+3
-15
No files found.
app/models/pages/lookup_path.rb
View file @
08d1433e
...
@@ -50,8 +50,6 @@ module Pages
...
@@ -50,8 +50,6 @@ module Pages
def
zip_source
def
zip_source
return
unless
deployment
&
.
file
return
unless
deployment
&
.
file
return
if
deployment
.
file
.
file_storage?
&&
!
Feature
.
enabled?
(
:pages_serve_with_zip_file_protocol
,
project
,
default_enabled: :yaml
)
global_id
=
::
Gitlab
::
GlobalId
.
build
(
deployment
,
id:
deployment
.
id
).
to_s
global_id
=
::
Gitlab
::
GlobalId
.
build
(
deployment
,
id:
deployment
.
id
).
to_s
{
{
...
...
changelogs/unreleased/321677-enable-and-remove-pages_serve_with_zip_file_protocol-feature-flag.yml
0 → 100644
View file @
08d1433e
---
title
:
Remove pages_serve_with_zip_file_protocol feature flag
merge_request
:
59908
author
:
type
:
added
config/feature_flags/development/pages_serve_with_zip_file_protocol.yml
deleted
100644 → 0
View file @
95638a05
---
name
:
pages_serve_with_zip_file_protocol
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46320
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/321677
milestone
:
'
13.6'
type
:
development
group
:
group::release
default_enabled
:
true
spec/models/pages/lookup_path_spec.rb
View file @
08d1433e
...
@@ -47,15 +47,11 @@ RSpec.describe Pages::LookupPath do
...
@@ -47,15 +47,11 @@ RSpec.describe Pages::LookupPath do
describe
'#source'
do
describe
'#source'
do
let
(
:source
)
{
lookup_path
.
source
}
let
(
:source
)
{
lookup_path
.
source
}
shared_examples
'uses disk storage'
do
it
'uses disk storage'
,
:aggregate_failures
do
it
'uses disk storage'
,
:aggregate_failures
do
expect
(
source
[
:type
]).
to
eq
(
'file'
)
expect
(
source
[
:type
]).
to
eq
(
'file'
)
expect
(
source
[
:path
]).
to
eq
(
project
.
full_path
+
"/public/"
)
expect
(
source
[
:path
]).
to
eq
(
project
.
full_path
+
"/public/"
)
end
end
end
include_examples
'uses disk storage'
it
'return nil when legacy storage is disabled and there is no deployment'
do
it
'return nil when legacy storage is disabled and there is no deployment'
do
stub_feature_flags
(
pages_serve_from_legacy_storage:
false
)
stub_feature_flags
(
pages_serve_from_legacy_storage:
false
)
expect
(
Gitlab
::
ErrorTracking
).
to
receive
(
:track_exception
)
expect
(
Gitlab
::
ErrorTracking
).
to
receive
(
:track_exception
)
...
@@ -107,14 +103,6 @@ RSpec.describe Pages::LookupPath do
...
@@ -107,14 +103,6 @@ RSpec.describe Pages::LookupPath do
)
)
end
end
end
end
context
'when pages_serve_with_zip_file_protocol feature flag is disabled'
do
before
do
stub_feature_flags
(
pages_serve_with_zip_file_protocol:
false
)
end
include_examples
'uses disk storage'
end
end
end
context
'when deployment were created during migration'
do
context
'when deployment were created during migration'
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