Merge branch 'refactor-pipeline-errors_message-ce' into 'master'

CE Port: Refactor pipeline errors_message

See merge request gitlab-org/gitlab-ce!30116

2 files changed, 5 insertions, 1 deletions

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index fd5aa216174..20ca4a9ab24 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -790,6 +790,10 @@ module Ci
       stages.find_by!(name: name)
     end
 
+    def error_messages
+      errors ? errors.full_messages.to_sentence : ""
+    end
+
     private
 
     def ci_yaml_from_repo
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
index c17712355af..cdcc4b15bea 100644
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -65,7 +65,7 @@ module Ci
     def execute!(*args, &block)
       execute(*args, &block).tap do |pipeline|
         unless pipeline.persisted?
-          raise CreateError, pipeline.errors.full_messages.join(',')
+          raise CreateError, pipeline.error_messages
         end
       end
     end