Commit 59760832ce02ccaa912baf5edef7f1cdb10392ce

Authored by Nathan Broadbent
1 parent f2f02b6c
Exists in master and in 1 other branch production

Updated user agent string to show OS

Showing 3 changed files with 8 additions and 4 deletions   Show diff stats
@@ -8,7 +8,7 @@ gem 'haml' @@ -8,7 +8,7 @@ gem 'haml'
8 gem 'htmlentities', "~> 4.3.0" 8 gem 'htmlentities', "~> 4.3.0"
9 gem 'rack-ssl', :require => 'rack/ssl' # force SSL 9 gem 'rack-ssl', :require => 'rack/ssl' # force SSL
10 10
11 -gem 'useragent', '~> 0.3.1' 11 +gem 'useragent', '~> 0.4.16'
12 gem 'inherited_resources' 12 gem 'inherited_resources'
13 gem 'SystemTimer', :platform => :ruby_18 13 gem 'SystemTimer', :platform => :ruby_18
14 gem 'actionmailer_inline_css', "~> 1.3.0" 14 gem 'actionmailer_inline_css', "~> 1.3.0"
@@ -328,7 +328,7 @@ GEM @@ -328,7 +328,7 @@ GEM
328 kgio (~> 2.6) 328 kgio (~> 2.6)
329 rack 329 rack
330 raindrops (~> 0.7) 330 raindrops (~> 0.7)
331 - useragent (0.3.2) 331 + useragent (0.4.16)
332 warden (1.2.1) 332 warden (1.2.1)
333 rack (>= 1.0) 333 rack (>= 1.0)
334 webmock (1.8.7) 334 webmock (1.8.7)
@@ -396,7 +396,7 @@ DEPENDENCIES @@ -396,7 +396,7 @@ DEPENDENCIES
396 uglifier (>= 1.0.3) 396 uglifier (>= 1.0.3)
397 underscore-rails 397 underscore-rails
398 unicorn 398 unicorn
399 - useragent (~> 0.3.1) 399 + useragent (~> 0.4.16)
400 webmock 400 webmock
401 xmpp4r 401 xmpp4r
402 yajl-ruby 402 yajl-ruby
app/models/notice.rb
@@ -43,7 +43,11 @@ class Notice @@ -43,7 +43,11 @@ class Notice
43 end 43 end
44 44
45 def user_agent_string 45 def user_agent_string
46 - (user_agent.nil? || user_agent.none?) ? "N/A" : "#{user_agent.browser} #{user_agent.version}" 46 + if user_agent.nil? || user_agent.none?
  47 + "N/A"
  48 + else
  49 + "#{user_agent.browser} #{user_agent.version} (#{user_agent.os})"
  50 + end
47 end 51 end
48 52
49 def environment_name 53 def environment_name