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:
Diffstat (limited to 'app/services/projects/update_service.rb')
-rw-r--r--app/services/projects/update_service.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/app/services/projects/update_service.rb b/app/services/projects/update_service.rb
index 7f25ab5883f..8639e2f833f 100644
--- a/app/services/projects/update_service.rb
+++ b/app/services/projects/update_service.rb
@@ -51,12 +51,6 @@ module Projects
private
def add_pages_unique_domain
- if Feature.disabled?(:pages_unique_domain, project)
- params[:project_setting_attributes]&.delete(:pages_unique_domain_enabled)
-
- return
- end
-
return unless params.dig(:project_setting_attributes, :pages_unique_domain_enabled)
# If the project used a unique domain once, it'll always use the same
@@ -119,7 +113,7 @@ module Projects
end
def remove_unallowed_params
- params.delete(:emails_disabled) unless can?(current_user, :set_emails_disabled, project)
+ params.delete(:emails_enabled) unless can?(current_user, :set_emails_disabled, project)
params.delete(:runner_registration_enabled) if Gitlab::CurrentSettings.valid_runner_registrars.exclude?('project')
end