From edb9c13d7ce100e03a317a51dbebb266c43d8a55 Mon Sep 17 00:00:00 2001
From: echarp <manu@echarp.org>
Date: Thu, 4 May 2017 22:05:30 +0200
Subject: [PATCH] Bundle update

---
 Gemfile.lock | 43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3694a680..7f3a6dbf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,8 @@
 GIT
   remote: git://github.com/activeadmin/activeadmin.git
-  revision: 5e2d9c2f8620476b2045b1f05fc129fe9900846b
+  revision: adcc7e379d1a3f2fab478f0b5c4d11af1bf488ea
   specs:
-    activeadmin (1.0.0.pre5)
+    activeadmin (1.0.0)
       arbre (>= 1.1.1)
       bourbon
       coffee-rails
@@ -168,12 +168,13 @@ GEM
     guard-rubocop (1.2.0)
       guard (~> 2.0)
       rubocop (~> 0.20)
-    haml (4.0.7)
+    haml (5.0.1)
+      temple (>= 0.8.0)
       tilt
-    haml-rails (0.9.0)
+    haml-rails (1.0.0)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
-      haml (>= 4.0.6, < 5.0)
+      haml (>= 4.0.6, < 6.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
     haml_lint (0.24.0)
@@ -186,12 +187,12 @@ GEM
       actionpack (>= 3.2, < 5)
       activesupport (>= 3.2, < 5)
     high_voltage (3.0.0)
-    html2haml (2.1.0)
+    html2haml (2.2.0)
       erubis (~> 2.7.0)
-      haml (~> 4.0)
+      haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    http (2.2.1)
+    http (2.2.2)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
       http-form_data (~> 1.0.1)
@@ -202,11 +203,11 @@ GEM
     http_accept_language (2.1.0)
     http_parser.rb (0.6.0)
     i18n (0.8.1)
-    ice_cube (0.16.0)
-    inherited_resources (1.7.1)
-      actionpack (>= 3.2, < 5.1)
+    ice_cube (0.16.1)
+    inherited_resources (1.7.2)
+      actionpack (>= 3.2, < 5.2.x)
       has_scope (~> 0.6)
-      railties (>= 3.2, < 5.1)
+      railties (>= 3.2, < 5.2.x)
       responders
     jbuilder (2.6.3)
       activesupport (>= 3.0.0, < 5.2)
@@ -240,7 +241,7 @@ GEM
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.11)
-    mail (2.6.4)
+    mail (2.6.5)
       mime-types (>= 1.16, < 4)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -255,7 +256,7 @@ GEM
     modernizr-rails (2.7.1)
     multi_json (1.12.1)
     multipart-post (2.0.0)
-    mysql2 (0.4.5)
+    mysql2 (0.4.6)
     naught (1.1.0)
     nenv (0.3.0)
     nokogiri (1.7.1)
@@ -264,7 +265,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     orm_adapter (0.5.0)
-    paper_trail (7.0.1)
+    paper_trail (7.0.2)
       activerecord (>= 4.0, < 5.2)
       request_store (~> 1.1)
     parser (2.4.0.0)
@@ -300,7 +301,7 @@ GEM
       railties (= 4.2.8)
       sprockets-rails
     rails-assets-leaflet (1.0.3)
-    rails-assets-leaflet.markercluster (1.0.4)
+    rails-assets-leaflet.markercluster (1.0.5)
       rails-assets-leaflet (>= 1.0.3)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -334,8 +335,9 @@ GEM
     redcarpet (3.4.0)
     ref (2.0.0)
     request_store (1.3.2)
-    responders (2.3.0)
-      railties (>= 4.2.0, < 5.1)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
     rubocop (0.48.1)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
@@ -380,19 +382,20 @@ GEM
     sysexits (1.2.0)
     tagsinput-rails (1.3.5.1)
       railties (>= 3.1)
+    temple (0.8.0)
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.7)
-    tinymce-rails (4.5.6)
+    tinymce-rails (4.5.7)
       railties (>= 3.1.1)
     tinymce-rails-langs (4.20160310)
       tinymce-rails (~> 4.1, >= 4.1.10)
     turbolinks (5.0.1)
       turbolinks-source (~> 5)
-    turbolinks-source (5.0.0)
+    turbolinks-source (5.0.2)
     twitter (6.1.0)
       addressable (~> 2.5)
       buftok (~> 0.2.0)