summaryrefslogtreecommitdiff
path: root/lib/ci
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-21 16:31:14 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-21 16:31:14 -0600
commitf40716f48a25809d197ba2abf32ce150b7b73efa (patch)
tree3356ea055ddee37517467c1f0ed4f4b98f655e6f /lib/ci
parentdeb62183edbd9111691f62a4f6a9febb1fcd79f7 (diff)
downloadgitlab-ce-f40716f48a25809d197ba2abf32ce150b7b73efa.tar.gz
No more and/or
Diffstat (limited to 'lib/ci')
-rw-r--r--lib/ci/ansi2html.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ci/ansi2html.rb b/lib/ci/ansi2html.rb
index c10d3616f31..158a33f26fe 100644
--- a/lib/ci/ansi2html.rb
+++ b/lib/ci/ansi2html.rb
@@ -126,7 +126,7 @@ module Ci
# We are only interested in color and text style changes - triggered by
# sequences starting with '\e[' and ending with 'm'. Any other control
# sequence gets stripped (including stuff like "delete last line")
- return unless indicator == '[' and terminator == 'm'
+ return unless indicator == '[' && terminator == 'm'
close_open_tags()