From 658b0480dfd0e4970a761e34acc7ef44b47d2396 Mon Sep 17 00:00:00 2001
From: echarp <echarpentier@april.org>
Date: Tue, 17 Mar 2015 23:51:43 +0100
Subject: [PATCH] Bundle update

---
 Gemfile.lock | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 622fb295..5ea002a2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,8 @@
 GIT
   remote: git://github.com/activeadmin/activeadmin.git
-  revision: 60914c887942cb34d737428fb9813f69bb8ae3ee
+  revision: e3a7354c0196743e2462bdc27c591e8285d110b0
   specs:
-    activeadmin (1.0.0.pre)
+    activeadmin (1.0.0.pre1)
       arbre (~> 1.0, >= 1.0.2)
       bourbon
       coffee-rails
@@ -86,22 +86,20 @@ GEM
     bourbon (4.2.1)
       sass (~> 3.4)
       thor
-    brakeman (3.0.1)
+    brakeman (3.0.2)
       erubis (~> 2.6)
       fastercsv (~> 1.5)
       haml (>= 3.0, < 5.0)
       highline (~> 1.6.20)
       multi_json (~> 1.2)
       ruby2ruby (~> 2.1.1)
-      ruby_parser (~> 3.5.0)
+      ruby_parser (~> 3.6.2)
       sass (~> 3.0)
       terminal-table (~> 1.4)
     buftok (0.2.0)
     builder (3.2.2)
-    byebug (3.5.1)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
-      slop (~> 3.6)
+    byebug (4.0.2)
+      columnize (= 0.9.0)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     chunky_png (1.3.4)
@@ -131,7 +129,6 @@ GEM
       sass-rails (<= 5.0.1)
       sprockets (< 2.13)
     debug_inspector (0.0.2)
-    debugger-linecache (1.2.0)
     devise (3.4.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -154,17 +151,17 @@ GEM
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
     fastercsv (1.5.5)
-    ffi (1.9.6)
-    font-awesome-sass (4.3.1)
+    ffi (1.9.8)
+    font-awesome-sass (4.3.2)
       sass (~> 3.2)
     formatador (0.2.5)
     formtastic (3.1.3)
       actionpack (>= 3.2.13)
-    formtastic_i18n (0.1.1)
+    formtastic_i18n (0.2.0)
     geocoder (1.2.7)
     globalid (0.3.3)
       activesupport (>= 4.1.0)
-    guard (2.12.4)
+    guard (2.12.5)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
@@ -201,10 +198,10 @@ GEM
       haml (~> 4.0)
       rubocop (>= 0.25.0)
       sysexits (~> 1.1)
-    haml-rails (0.8.2)
+    haml-rails (0.9.0)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
-      haml (>= 3.1, < 5.0)
+      haml (>= 4.0.6, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
     has_scope (0.6.0)
@@ -248,7 +245,7 @@ GEM
       railties (>= 3.1)
     leaflet-rails (0.7.4)
     libv8 (3.16.14.7)
-    listen (2.8.5)
+    listen (2.9.0)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -304,11 +301,11 @@ GEM
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.5)
+    rails-dom-testing (1.0.6)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.1)
+    rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
     rails-i18n (4.0.4)
       i18n (~> 0.6)
@@ -345,7 +342,7 @@ GEM
     ruby2ruby (2.1.3)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
-    ruby_parser (3.5.0)
+    ruby_parser (3.6.5)
       sexp_processor (~> 4.1)
     sass (3.4.13)
     sass-rails (5.0.1)
@@ -359,7 +356,7 @@ GEM
       rdoc (~> 4.0)
     select2-rails (3.5.9.3)
       thor (~> 0.14)
-    sexp_processor (4.4.5)
+    sexp_processor (4.5.0)
     shellany (0.0.1)
     simple_calendar (1.1.10)
       rails (>= 3.0)
@@ -389,7 +386,7 @@ GEM
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
     timers (4.0.1)
       hitimes
@@ -417,7 +414,7 @@ GEM
       json (>= 1.8.0)
     warden (1.2.3)
       rack (>= 1.0)
-    web-console (2.1.1)
+    web-console (2.1.2)
       activemodel (>= 4.0)
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)