From 3fb0f52574313375af499673833034dcc4636c41 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Sat, 7 Sep 2013 08:50:16 +1000
Subject: [PATCH] disable flamegraph while I figure out why fast stack is not
 working for some people on x32

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

diff --git a/Gemfile b/Gemfile
index c8e51354cd1..a0c1a57705f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -189,7 +189,7 @@ gem 'lru_redux'
 #  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 fc321a4d067..a42af922249 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -188,14 +188,9 @@ GEM
     fast_blank (0.0.1)
       rake
       rake-compiler
-    fast_stack (0.0.5)
-      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)
@@ -484,7 +479,6 @@ 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 49fc6135be8..28c7de19a6e 100644
--- a/Gemfile_rails4.lock
+++ b/Gemfile_rails4.lock
@@ -216,14 +216,9 @@ GEM
     fast_blank (0.0.1)
       rake
       rake-compiler
-    fast_stack (0.0.5)
-      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)
@@ -489,7 +484,6 @@ 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 35765a14440..42ba849909c 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