diff --git a/Gemfile b/Gemfile index 6484c2565..ac6c7a849 100644 --- a/Gemfile +++ b/Gemfile @@ -121,6 +121,8 @@ group :development do gem 'web-console' gem 'rack-handlers' + + gem 'xray-rails' end group :development, :test do @@ -153,4 +155,3 @@ end group :production, :staging do gem 'sentry-raven' end - diff --git a/Gemfile.lock b/Gemfile.lock index c3422e6c4..b30c53477 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -622,6 +622,8 @@ GEM xml-simple (1.1.5) xpath (2.0.0) nokogiri (~> 1.3) + xray-rails (0.2.0) + rails (>= 3.1.0) PLATFORMS ruby @@ -699,6 +701,7 @@ DEPENDENCIES web-console webmock will_paginate-bootstrap + xray-rails BUNDLED WITH 1.13.7 diff --git a/app/views/layouts/_ie_lt_10.html.haml b/app/views/layouts/_ie_lt_10.html.haml index 07d0581d5..3dcbb4a40 100644 --- a/app/views/layouts/_ie_lt_10.html.haml +++ b/app/views/layouts/_ie_lt_10.html.haml @@ -1,4 +1,9 @@ +="".html_safe + diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 1730f61a7..7b4214397 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -22,11 +22,9 @@ %script{type: 'text/javascript'} (typeof jQuery !== 'undefined') && (jQuery.fx.off = true); - ="".html_safe %div#wrap %div.row