From c680d7457132af79d330d4b6754fb913ab9665ce Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 5 May 2014 12:50:46 -0400
Subject: [PATCH] Disable logster for now due to a conflict.

---
 Gemfile      | 4 +++-
 Gemfile.lock | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7db28f8e2df..f6df068e2a2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -222,7 +222,9 @@ gem 'ruby-readability', require: false
 gem 'simple-rss', require: false
 gem 'gctools', require: false, platform: :mri_21
 gem 'stackprof', require: false, platform: :mri_21
-gem 'logster'
+
+# Disabled as it conflicts with our /admin/logs routes
+# gem 'logster'
 
 # perftools only works on 1.9 atm
 group :profile do
diff --git a/Gemfile.lock b/Gemfile.lock
index e525fd20f0b..76dc5c8b73c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -151,7 +151,6 @@ GEM
       thor (~> 0.15)
     libv8 (3.16.14.3)
     listen (0.7.3)
-    logster (0.0.2)
     lru_redux (0.8.1)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -420,7 +419,6 @@ DEPENDENCIES
   image_sorcery
   librarian (>= 0.0.25)
   listen (= 0.7.3)
-  logster
   lru_redux
   message_bus
   minitest