summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-10-15 07:56:51 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-10-15 07:56:51 +0000
commit05dd7f9718cdd74cfd20747e4bea534a1cba2ae1 (patch)
tree3f57aa042a97f0d2ad84cbf44493eef68e853605 /lib
parent98905c6e6ec61b0697e895d1ccfaaab82aa70666 (diff)
parent22d6ad7550a897e5a60249f3a5944883f1386fc1 (diff)
downloadgitlab-ce-05dd7f9718cdd74cfd20747e4bea534a1cba2ae1.tar.gz
Merge branch '52421-show-canary-no-canary-in-the-performance-bar' into 'master'
Resolve "Show canary / no-canary in the performance bar" Closes #52421 See merge request gitlab-org/gitlab-ce!22222
Diffstat (limited to 'lib')
-rw-r--r--lib/peek/views/host.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/peek/views/host.rb b/lib/peek/views/host.rb
index da0816b364c..b77355ea11b 100644
--- a/lib/peek/views/host.rb
+++ b/lib/peek/views/host.rb
@@ -4,7 +4,10 @@ module Peek
module Views
class Host < View
def results
- { hostname: Gitlab::Environment.hostname }
+ {
+ hostname: Gitlab::Environment.hostname,
+ canary: Gitlab::Utils.to_boolean(ENV['CANARY'])
+ }
end
end
end