Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 2 deletions

diff --git a/lib/gitlab/ci/lint.rb b/lib/gitlab/ci/lint.rb
index 356463493cb..f703a200dd8 100644
--- a/lib/gitlab/ci/lint.rb
+++ b/lib/gitlab/ci/lint.rb
@@ -40,7 +40,7 @@ module Gitlab
         Result.new(
           jobs: dry_run_convert_to_jobs(pipeline.stages),
           errors: pipeline.error_messages.map(&:content),
-          warnings: pipeline.warning_messages.map(&:content)
+          warnings: pipeline.warning_messages(limit: ::Gitlab::Ci::Warnings::MAX_LIMIT).map(&:content)
         )
       end
 
@@ -55,7 +55,7 @@ module Gitlab
         Result.new(
           jobs: static_validation_convert_to_jobs(result),
           errors: result.errors,
-          warnings: result.warnings
+          warnings: result.warnings.take(::Gitlab::Ci::Warnings::MAX_LIMIT) # rubocop: disable CodeReuse/ActiveRecord
         )
       end
 
diff --git a/lib/gitlab/ci/warnings.rb b/lib/gitlab/ci/warnings.rb
new file mode 100644
index 00000000000..7138fd21b72
--- /dev/null
+++ b/lib/gitlab/ci/warnings.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Gitlab::Ci::Warnings
+  MAX_LIMIT = 25
+end