Skip to content
Snippets Groups Projects
Commit f40716f4 authored by Douwe Maan's avatar Douwe Maan
Browse files

No more and/or

parent deb62183
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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()
 
Loading
Loading
Loading
Loading
@@ -11,7 +11,7 @@ module Gitlab
mem = 0
match = File.read('/proc/self/status').match(/VmRSS:\s+(\d+)/)
 
if match and match[1]
if match && match[1]
mem = match[1].to_f * 1024
end
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment