From 98267d439ac6794f827eb1ea537780f40a976d0d Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Mon, 9 Sep 2013 21:19:23 +1000
Subject: [PATCH] fixed ruby 2.0 p0 bug in fast_stack so re-pushing

---
 Gemfile                                 | 3 +--
 Gemfile.lock                            | 6 ++++++
 Gemfile_rails4.lock                     | 6 ++++++
 config/initializers/06-mini_profiler.rb | 2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index a0c1a5770..d2df18df7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -188,8 +188,7 @@ gem 'lru_redux'
 #  If you want to amend mini profiler to do the monkey patches in the railstie
 #  we are open to it. by deferring require to the initializer we can configure disourse installs without it
 
-# gem 'rack-mini-profiler', '0.1.30', require: false
-# gem 'flamegraph', require: false
+gem 'flamegraph', require: false
 gem 'rack-mini-profiler', require: false
 
 # used for caching, optional
diff --git a/Gemfile.lock b/Gemfile.lock
index a42af9222..457e7b363 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -188,9 +188,14 @@ GEM
     fast_blank (0.0.1)
       rake
       rake-compiler
+    fast_stack (0.0.6)
+      rake
+      rake-compiler
     fast_xs (0.8.0)
     fastimage (1.3.0)
     ffi (1.8.1)
+    flamegraph (0.0.2)
+      fast_stack
     fog (1.14.0)
       builder
       excon (~> 0.25.0)
@@ -479,6 +484,7 @@ DEPENDENCIES
   fast_xor!
   fast_xs
   fastimage
+  flamegraph
   fog
   handlebars-source (= 1.0.12)
   highline
diff --git a/Gemfile_rails4.lock b/Gemfile_rails4.lock
index 28c7de19a..4d0cc1312 100644
--- a/Gemfile_rails4.lock
+++ b/Gemfile_rails4.lock
@@ -216,9 +216,14 @@ GEM
     fast_blank (0.0.1)
       rake
       rake-compiler
+    fast_stack (0.0.6)
+      rake
+      rake-compiler
     fast_xs (0.8.0)
     fastimage (1.5.0)
     ffi (1.9.0)
+    flamegraph (0.0.2)
+      fast_stack
     fog (1.14.0)
       builder
       excon (~> 0.25.0)
@@ -484,6 +489,7 @@ DEPENDENCIES
   fast_xor!
   fast_xs
   fastimage
+  flamegraph
   fog
   handlebars-source (= 1.0.12)
   highline
diff --git a/config/initializers/06-mini_profiler.rb b/config/initializers/06-mini_profiler.rb
index 42ba84990..35765a144 100644
--- a/config/initializers/06-mini_profiler.rb
+++ b/config/initializers/06-mini_profiler.rb
@@ -1,7 +1,7 @@
 # If Mini Profiler is included via gem
 if Rails.configuration.respond_to?(:enable_mini_profiler) && Rails.configuration.enable_mini_profiler
   require 'rack-mini-profiler'
-  # require 'flamegraph'
+  require 'flamegraph'
   # initialization is skipped so trigger it
   Rack::MiniProfilerRails.initialize!(Rails.application)
 end