Commit 8887c245 authored by Luke "Jared" Bennett's avatar Luke "Jared" Bennett

Added canary conditional to status_entity.rb

parent ed316249
...@@ -8,7 +8,12 @@ class StatusEntity < Grape::Entity ...@@ -8,7 +8,12 @@ class StatusEntity < Grape::Entity
expose :favicon do |status| expose :favicon do |status|
dir = 'ci_favicons' dir = 'ci_favicons'
dir = File.join(dir, 'dev') if Rails.env.development?
if ENV['CANARY']
dir = File.join(dir, 'canary')
elsif Rails.env.development?
dir = File.join(dir, 'dev')
end
ActionController::Base.helpers.image_path(File.join(dir, "#{status.favicon}.ico")) ActionController::Base.helpers.image_path(File.join(dir, "#{status.favicon}.ico"))
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment