Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

1 files changed, 0 insertions, 19 deletions

diff --git a/app/services/projects/update_service.rb b/app/services/projects/update_service.rb
index b34ecf06e52..fb810af3e6b 100644
--- a/app/services/projects/update_service.rb
+++ b/app/services/projects/update_service.rb
@@ -104,7 +104,6 @@ module Projects
         system_hook_service.execute_hooks_for(project, :update)
       end
 
-      update_pages_config if changing_pages_related_config?
       update_pending_builds if runners_settings_toggled?
     end
 
@@ -112,10 +111,6 @@ module Projects
       AfterRenameService.new(project, path_before: project.path_before_last_save, full_path_before: project.full_path_before_last_save)
     end
 
-    def changing_pages_related_config?
-      changing_pages_https_only? || changing_pages_access_level?
-    end
-
     def update_failed!
       model_errors = project.errors.full_messages.to_sentence
       error_message = model_errors.presence || s_('UpdateProject|Project could not be updated!')
@@ -143,10 +138,6 @@ module Projects
       params.dig(:project_feature_attributes, :wiki_access_level).to_i > ProjectFeature::DISABLED
     end
 
-    def changing_pages_access_level?
-      params.dig(:project_feature_attributes, :pages_access_level)
-    end
-
     def ensure_wiki_exists
       return if project.create_wiki
 
@@ -154,16 +145,6 @@ module Projects
       Gitlab::Metrics.counter(:wiki_can_not_be_created_total, 'Counts the times we failed to create a wiki').increment
     end
 
-    def update_pages_config
-      return unless project.pages_deployed?
-
-      PagesUpdateConfigurationWorker.perform_async(project.id)
-    end
-
-    def changing_pages_https_only?
-      project.previous_changes.include?(:pages_https_only)
-    end
-
     def changing_repository_storage?
       new_repository_storage = params[:repository_storage]