Add latest changes from gitlab-org/gitlab@master

1 files changed, 14 insertions, 7 deletions

diff --git a/lib/gitlab/ci/ansi2json/style.rb b/lib/gitlab/ci/ansi2json/style.rb
index 2739ffdfa5d..77f61178b37 100644
--- a/lib/gitlab/ci/ansi2json/style.rb
+++ b/lib/gitlab/ci/ansi2json/style.rb
@@ -15,14 +15,10 @@ module Gitlab
         end
 
         def update(ansi_commands)
-          command = ansi_commands.shift
-          return unless command
-
-          if changes = Gitlab::Ci::Ansi2json::Parser.new(command, ansi_commands).changes
-            apply_changes(changes)
-          end
+          # treat e\[m as \e[0m
+          ansi_commands = ['0'] if ansi_commands.empty?
 
-          update(ansi_commands)
+          evaluate_stack_command(ansi_commands)
         end
 
         def set?
@@ -50,6 +46,17 @@ module Gitlab
 
         private
 
+        def evaluate_stack_command(ansi_commands)
+          command = ansi_commands.shift
+          return unless command
+
+          if changes = Gitlab::Ci::Ansi2json::Parser.new(command, ansi_commands).changes
+            apply_changes(changes)
+          end
+
+          evaluate_stack_command(ansi_commands)
+        end
+
         def apply_changes(changes)
           case
           when changes[:reset]