aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2015-04-09 09:52:13 +0100
committerGareth Rees <gareth@mysociety.org>2015-04-09 09:52:13 +0100
commit7a550cf766b7d7d2ac4eda1e35036aea972e5a1d (patch)
treeb79873c5945c5edb36e98df9b1e417922b9cf031
parent5c4c867b4834a30c0c74fd120aeb58d84c105230 (diff)
add peek-rblineprof for stack profilepeek-master
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock6
-rw-r--r--app/assets/javascripts/application.js1
-rw-r--r--app/assets/stylesheets/responsive/application.css3
-rw-r--r--config/initializers/peek.rb1
5 files changed, 11 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 306955400..33594af3c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -56,6 +56,7 @@ gem 'peek-pg'
gem 'peek-gc'
gem 'peek-performance_bar'
gem 'peek-active_record'
+gem 'peek-rblineprof'
group :assets do
gem 'bootstrap-sass', '~> 2.3.1.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index a7fe0a0dd..2608dabff 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -192,6 +192,9 @@ GEM
atomic (>= 1.0.0)
peek
pg
+ peek-rblineprof (0.1.2)
+ peek
+ rblineprof
pg (0.17.1)
polyglot (0.3.5)
pry (0.9.12.6)
@@ -227,6 +230,8 @@ GEM
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
+ rblineprof (0.3.3)
+ debugger-ruby_core_source (~> 1.2)
rbx-require-relative (0.0.9)
rdoc (3.12.2)
json (~> 1.4)
@@ -357,6 +362,7 @@ DEPENDENCIES
peek-git
peek-performance_bar
peek-pg
+ peek-rblineprof
pg (~> 0.17.1)
pry (~> 0.9.6)
quiet_assets (~> 1.0.2)
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 5e03ac12d..95a196afa 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -9,3 +9,4 @@
//= require peek
//= require peek/views/performance_bar
//= require peek/views/active_record
+//= require peek/views/rblineprof
diff --git a/app/assets/stylesheets/responsive/application.css b/app/assets/stylesheets/responsive/application.css
index 94f65641c..b628425ad 100644
--- a/app/assets/stylesheets/responsive/application.css
+++ b/app/assets/stylesheets/responsive/application.css
@@ -3,6 +3,7 @@
*= require normalize
*= require peek
*= require peek/views/performance_bar
+*= require peek/views/rblineprof
*= require responsive/main
*= require jquery.ui.datepicker
*= require jquery.ui.tabs
@@ -14,4 +15,4 @@
left: 0;
right: 0;
z-index: 999;
-} \ No newline at end of file
+}
diff --git a/config/initializers/peek.rb b/config/initializers/peek.rb
index 9466b71ed..5370e084b 100644
--- a/config/initializers/peek.rb
+++ b/config/initializers/peek.rb
@@ -2,4 +2,5 @@ Peek.into Peek::Views::Git, :nwo => 'mysociety/alaveteli', :default_branch => 'r
Peek.into Peek::Views::PerformanceBar
Peek.into Peek::Views::PG
Peek.into Peek::Views::ActiveRecord, :type_tracking => false
+Peek.into Peek::Views::Rblineprof
# Peek.into Peek::Views::GC