diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-02 21:10:41 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-02 21:10:41 +0300 |
| commit | 93fdeb5a619e45cb64ff346c127ff4d68c619ffe (patch) | |
| tree | 93a645322b77bec56bec7b7ecbed56a7f866cea0 /app/controllers/projects | |
| parent | b3432e3b6d3ad4baf73847907c4fea91b59288a5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/pages_controller.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/app/controllers/projects/pages_controller.rb b/app/controllers/projects/pages_controller.rb index 6cfbb61fbb2..02579cd4283 100644 --- a/app/controllers/projects/pages_controller.rb +++ b/app/controllers/projects/pages_controller.rb @@ -65,15 +65,7 @@ class Projects::PagesController < Projects::ApplicationController end def project_params_attributes - attributes = %i[pages_https_only] - - return attributes unless Feature.enabled?(:pages_unique_domain, @project) - - attributes + [ - project_setting_attributes: [ - :pages_unique_domain_enabled - ] - ] + [:pages_https_only, { project_setting_attributes: [:pages_unique_domain_enabled] }] end end |