From f5a0d77e2a994ff4a1af9d1f7a68762703c82875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sat, 28 Feb 2015 01:22:24 +0100
Subject: [PATCH] bump rails_admin

---
 Gemfile      |  2 +-
 Gemfile.lock | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index 00e7f285a..55bd11b69 100644
--- a/Gemfile
+++ b/Gemfile
@@ -187,7 +187,7 @@ group :production do # we don't install these on travis to speed up test runs
 
   # Administration
 
-  gem 'rails_admin', '0.6.5'
+  gem 'rails_admin', '0.6.6'
 
   # Analytics
 
diff --git a/Gemfile.lock b/Gemfile.lock
index a7e2e329d..889c09f4c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -104,7 +104,7 @@ GEM
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
+    coffee-script-source (1.9.1)
     columnize (0.9.0)
     compass (0.12.7)
       chunky_png (~> 1.2)
@@ -172,7 +172,7 @@ GEM
       ffi (>= 1.3.0)
     eventmachine (1.0.7)
     excon (0.44.3)
-    execjs (2.2.2)
+    execjs (2.3.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.5.0)
@@ -271,7 +271,7 @@ GEM
     fog-xml (0.1.1)
       fog-core
       nokogiri (~> 1.5, >= 1.5.11)
-    font-awesome-rails (4.2.0.0)
+    font-awesome-rails (4.3.0.0)
       railties (>= 3.2, < 5.0)
     foreman (0.62.0)
       thor (>= 0.13.6)
@@ -343,7 +343,7 @@ GEM
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.2)
+    jquery-ui-rails (5.0.3)
       railties (>= 3.2.16)
     js-routes (1.0.0)
       railties (>= 3.2)
@@ -356,7 +356,7 @@ GEM
       therubyracer (~> 0.12.1)
     json (1.8.2)
     jwt (1.0.0)
-    kaminari (0.16.1)
+    kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.9.2)
@@ -518,12 +518,12 @@ GEM
     rails-timeago (2.11.0)
       actionpack (>= 3.1)
       activesupport (>= 3.1)
-    rails_admin (0.6.5)
+    rails_admin (0.6.6)
       builder (~> 3.1)
       coffee-rails (~> 4.0)
       font-awesome-rails (>= 3.0, < 5)
       haml (~> 4.0)
-      jquery-rails (~> 3.0)
+      jquery-rails (>= 3.0, < 5)
       jquery-ui-rails (~> 5.0)
       kaminari (~> 0.14)
       nested_form (~> 0.3)
@@ -531,7 +531,7 @@ GEM
       rails (~> 4.0)
       remotipart (~> 1.0)
       safe_yaml (~> 1.0)
-      sass-rails (~> 4.0)
+      sass-rails (>= 4.0, < 6)
     railties (4.2.0)
       actionpack (= 4.2.0)
       activesupport (= 4.2.0)
@@ -762,7 +762,7 @@ DEPENDENCIES
   rails-assets-punycode (= 1.3.2)
   rails-i18n (= 4.0.4)
   rails-timeago (= 2.11.0)
-  rails_admin (= 0.6.5)
+  rails_admin (= 0.6.6)
   rb-fsevent (= 0.9.4)
   rb-inotify (= 0.9.5)
   redcarpet (= 3.2.0)