From 6c0ee4c78d8cc93b2a507256daab7d9d7303fd68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 24 Aug 2014 20:17:06 +0200
Subject: [PATCH] bump rails_admin

---
 Gemfile      |  2 +-
 Gemfile.lock | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index cd8b651c5..d17873dc6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -144,7 +144,7 @@ group :production do # we don't install these on travis to speed up test runs
 
   # Administration
 
-  gem 'rails_admin', '0.6.2'
+  gem 'rails_admin', '0.6.3'
 
   # Analytics
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 2c7b62b87..a82e03744 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -82,10 +82,10 @@ GEM
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.2.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
+    coffee-script-source (1.7.1)
     compass (0.12.7)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
@@ -135,8 +135,7 @@ GEM
     ethon (0.7.1)
       ffi (>= 1.3.0)
     excon (0.39.5)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+    execjs (2.2.1)
     factory_girl (4.4.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.4.1)
@@ -173,7 +172,7 @@ GEM
     fog-softlayer (0.3.15)
       fog-core
       fog-json
-    font-awesome-rails (4.0.3.1)
+    font-awesome-rails (4.1.0.0)
       railties (>= 3.2, < 5.0)
     foreigner (1.6.1)
       activerecord (>= 3.0.0)
@@ -236,12 +235,12 @@ GEM
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.2.0)
+    jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
     json (1.8.1)
     jwt (0.1.10)
       multi_json (>= 1.5)
-    kaminari (0.15.1)
+    kaminari (0.16.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.9.2)
@@ -320,9 +319,9 @@ GEM
     rack-mobile-detect (0.4.0)
       rack
     rack-piwik (0.3.0)
-    rack-pjax (0.7.0)
+    rack-pjax (0.8.0)
       nokogiri (~> 1.5)
-      rack (~> 1.3)
+      rack (~> 1.1)
     rack-protection (1.2.0)
       rack
     rack-rewrite (1.5.0)
@@ -348,7 +347,7 @@ GEM
     rails-timeago (2.4.0)
       actionpack (>= 3.1)
       activesupport (>= 3.1)
-    rails_admin (0.6.2)
+    rails_admin (0.6.3)
       builder (~> 3.1)
       coffee-rails (~> 4.0)
       font-awesome-rails (>= 3.0)
@@ -547,7 +546,7 @@ DEPENDENCIES
   rails (= 4.1.5)
   rails-i18n (= 4.0.2)
   rails-timeago (= 2.4.0)
-  rails_admin (= 0.6.2)
+  rails_admin (= 0.6.3)
   rails_autolink (= 1.1.5)
   rb-fsevent (= 0.9.4)
   rb-inotify (= 0.9.4)