Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

3 files changed, 3 insertions, 3 deletions

diff --git a/app/services/releases/base_service.rb b/app/services/releases/base_service.rb
index de7c97b3518..9dd0c9a007a 100644
--- a/app/services/releases/base_service.rb
+++ b/app/services/releases/base_service.rb
@@ -86,4 +86,4 @@ module Releases
   end
 end
 
-Releases::BaseService.prepend_if_ee('EE::Releases::BaseService')
+Releases::BaseService.prepend_mod_with('Releases::BaseService')
diff --git a/app/services/releases/create_evidence_service.rb b/app/services/releases/create_evidence_service.rb
index 78b6d77c2cb..64cce45e400 100644
--- a/app/services/releases/create_evidence_service.rb
+++ b/app/services/releases/create_evidence_service.rb
@@ -28,4 +28,4 @@ module Releases
   end
 end
 
-Releases::CreateEvidenceService.prepend_if_ee('EE::Releases::CreateEvidenceService')
+Releases::CreateEvidenceService.prepend_mod_with('Releases::CreateEvidenceService')
diff --git a/app/services/releases/create_service.rb b/app/services/releases/create_service.rb
index 11fdbaf3169..1096e207e02 100644
--- a/app/services/releases/create_service.rb
+++ b/app/services/releases/create_service.rb
@@ -57,7 +57,7 @@ module Releases
       create_evidence!(release, evidence_pipeline)
 
       success(tag: tag, release: release)
-    rescue => e
+    rescue StandardError => e
       error(e.message, 400)
     end