diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-19 15:11:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-19 15:11:06 +0300 |
| commit | 1fdc1d34e8e3cab28cd010a2b352974da9847e8e (patch) | |
| tree | a8158b1ef1a1f09ccb7d4789a3d7e519d8825b37 /app/models/pages | |
| parent | c44a81b8b9f4c27bec1f6df6ea25f135c390b730 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/pages')
| -rw-r--r-- | app/models/pages/lookup_path.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/pages/lookup_path.rb b/app/models/pages/lookup_path.rb index c6781f8f6e3..46c347e5cf5 100644 --- a/app/models/pages/lookup_path.rb +++ b/app/models/pages/lookup_path.rb @@ -52,7 +52,7 @@ module Pages def zip_source return unless deployment&.file - return if deployment.file.file_storage? && !Feature.enabled?(:pages_serve_with_zip_file_protocol, project) + return if deployment.file.file_storage? && !Feature.enabled?(:pages_serve_with_zip_file_protocol, project, default_enabled: true) return if deployment.migrated? && !Feature.enabled?(:pages_serve_from_migrated_zip, project) |