From 46f32610253d4e6aa43b728c735713abecab01e9 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Thu, 5 Dec 2013 17:40:16 +1100
Subject: [PATCH] Update: message bus, rack mini profiler and flame graph so
 they are sourced from ruby gems. MessageBus.diagnostics() in chrome dev tools
 Update: annotate models to latest, no need for git sourcing

---
 Gemfile             | 11 +++++-----
 Gemfile_rails4.lock | 52 ++++++++++++++-------------------------------
 2 files changed, 22 insertions(+), 41 deletions(-)

diff --git a/Gemfile b/Gemfile
index 65132f8f2..a6c0c3da6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -70,7 +70,7 @@ gem 'barber'
 
 gem 'vestal_versions', git: 'https://github.com/SamSaffron/vestal_versions'
 
-gem 'message_bus', git: 'https://github.com/SamSaffron/message_bus'
+gem 'message_bus'
 gem 'rails_multisite', path: 'vendor/gems/rails_multisite'
 gem 'simple_handlebars_rails', path: 'vendor/gems/simple_handlebars_rails'
 
@@ -79,6 +79,8 @@ gem 'airbrake', '3.1.2', require: false # errbit is broken with 3.1.3 for now
 gem 'sidetiq', '>= 0.3.6'
 gem 'eventmachine'
 gem 'fast_xs'
+
+# https://github.com/CodeMonkeySteve/fast_xor/issues/6
 gem 'fast_xor', git: 'https://github.com/CodeMonkeySteve/fast_xor.git'
 gem 'fastimage'
 gem 'fog', '1.18.0', require: false
@@ -159,8 +161,7 @@ group :development do
   gem 'better_errors'
   gem 'binding_of_caller'
   gem 'librarian', '>= 0.0.25', require: false
-  # https://github.com/ctran/annotate_models/pull/106
-  gem 'annotate', :git => 'https://github.com/SamSaffron/annotate_models.git'
+  gem 'annotate'
 end
 
 # Gem that enables support for plugins. It is required.
@@ -179,8 +180,8 @@ 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 'flamegraph', git: 'https://github.com/SamSaffron/flamegraph.git', require: false
-gem 'rack-mini-profiler',  git: 'https://github.com/MiniProfiler/rack-mini-profiler.git', require: false
+gem 'flamegraph', require: false
+gem 'rack-mini-profiler',  '0.9.0.pre ', require: false
 
 # used for caching, optional
 gem 'rack-cors', require: false
diff --git a/Gemfile_rails4.lock b/Gemfile_rails4.lock
index 8bb199b75..97ed503c0 100644
--- a/Gemfile_rails4.lock
+++ b/Gemfile_rails4.lock
@@ -31,37 +31,6 @@ GIT
       rake
       rake-compiler
 
-GIT
-  remote: https://github.com/MiniProfiler/rack-mini-profiler.git
-  revision: 740970f50af5cdb2655c7f468f1a627bf1d7c644
-  specs:
-    rack-mini-profiler (0.1.31)
-      rack (>= 1.1.3)
-
-GIT
-  remote: https://github.com/SamSaffron/annotate_models.git
-  revision: ebe4ba7e3f6ceeb43e4e40078da2b261a1bb71b2
-  specs:
-    annotate (2.6.0.beta1)
-      activerecord (>= 2.3.0)
-      rake (>= 0.8.7)
-
-GIT
-  remote: https://github.com/SamSaffron/flamegraph.git
-  revision: 07bd0ffdfd352e2fceb4edaf281990ba99156355
-  specs:
-    flamegraph (0.0.5)
-      fast_stack
-
-GIT
-  remote: https://github.com/SamSaffron/message_bus
-  revision: 2343e7968e84ea70f5e562f5730dfef3ce9602d9
-  specs:
-    message_bus (0.9.2)
-      eventmachine
-      rack (>= 1.1.3)
-      redis
-
 GIT
   remote: https://github.com/SamSaffron/vestal_versions
   revision: 007b30a5274db7db55da745a4482243559247782
@@ -137,6 +106,9 @@ GEM
     airbrake (3.1.2)
       activesupport
       builder
+    annotate (2.6.0)
+      activerecord (>= 2.3.0)
+      rake (>= 0.8.7)
     arel (4.0.1)
     atomic (1.1.14)
     barber (0.4.2)
@@ -189,6 +161,8 @@ GEM
     fast_xs (0.8.0)
     fastimage (1.5.2)
     ffi (1.9.3)
+    flamegraph (0.0.5)
+      fast_stack
     fog (1.18.0)
       builder
       excon (~> 0.28.0)
@@ -238,6 +212,10 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    message_bus (0.9.3.1)
+      eventmachine
+      rack (>= 1.1.3)
+      redis
     metaclass (0.0.1)
     method_source (0.8.2)
     mime-types (1.25.1)
@@ -308,6 +286,8 @@ GEM
     rack (1.5.2)
     rack-cors (0.2.8)
       rack
+    rack-mini-profiler (0.9.0.pre)
+      rack (>= 1.1.3)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
@@ -332,7 +312,7 @@ GEM
       thor (>= 0.18.1, < 2.0)
     raindrops (0.12.0)
     rake (10.1.0)
-    rake-compiler (0.9.1)
+    rake-compiler (0.9.2)
       rake
     rb-fsevent (0.9.3)
     rb-inotify (0.9.2)
@@ -466,7 +446,7 @@ DEPENDENCIES
   actionpack-action_caching
   active_model_serializers
   airbrake (= 3.1.2)
-  annotate!
+  annotate
   barber
   better_errors
   binding_of_caller
@@ -483,7 +463,7 @@ DEPENDENCIES
   fast_xor!
   fast_xs
   fastimage
-  flamegraph!
+  flamegraph
   fog (= 1.18.0)
   handlebars-source (~> 1.1.2)
   highline
@@ -494,7 +474,7 @@ DEPENDENCIES
   librarian (>= 0.0.25)
   listen (= 0.7.3)
   lru_redux
-  message_bus!
+  message_bus
   minitest
   mocha
   mock_redis
@@ -517,7 +497,7 @@ DEPENDENCIES
   puma
   qunit-rails
   rack-cors
-  rack-mini-profiler!
+  rack-mini-profiler (= 0.9.0.pre)
   rack-protection
   rails
   rails-observers