Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-02-23 21:10:40 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-02-23 21:10:40 +0300
commitc37dd28c4afd33fee46cff8ddfdada8a3f54564c (patch)
treec4fb2a3f93338991784cf89b3b1547ab23c1b5e1 /app/models/pages
parent5ff5047fdc2c614f347de5c388424b50a5460165 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/pages')
-rw-r--r--app/models/pages/lookup_path.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/models/pages/lookup_path.rb b/app/models/pages/lookup_path.rb
index 46c347e5cf5..cbae0120006 100644
--- a/app/models/pages/lookup_path.rb
+++ b/app/models/pages/lookup_path.rb
@@ -43,8 +43,6 @@ module Pages
def deployment
strong_memoize(:deployment) do
- next unless Feature.enabled?(:pages_serve_from_deployments, project, default_enabled: true)
-
project.pages_metadatum.pages_deployment
end
end