Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 1 insertions, 9 deletions

diff --git a/app/workers/pages_update_configuration_worker.rb b/app/workers/pages_update_configuration_worker.rb
index d0904db6b42..07238bae8c2 100644
--- a/app/workers/pages_update_configuration_worker.rb
+++ b/app/workers/pages_update_configuration_worker.rb
@@ -10,14 +10,6 @@ class PagesUpdateConfigurationWorker
     project = Project.find_by_id(project_id)
     return unless project
 
-    result = Projects::UpdatePagesConfigurationService.new(project).execute
-
-    # The ConfigurationService swallows all exceptions and wraps them in a status
-    # we need to keep this while the feature flag still allows running this
-    # service within a request.
-    # But we might as well take advantage of sidekiq retries here.
-    # We should let the service raise after we remove the feature flag
-    # https://gitlab.com/gitlab-org/gitlab/-/issues/230695
-    raise result[:exception] if result[:exception]
+    Projects::UpdatePagesConfigurationService.new(project).execute
   end
 end