From 35c847d38dc22002dca3bd4f24d61b485608c92a Mon Sep 17 00:00:00 2001
From: echarp <emmanuel.charpentier@free.fr>
Date: Sun, 9 Nov 2014 11:31:30 +0100
Subject: [PATCH] Bundle update
---
Gemfile.lock | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 325c6e6f2..842eb613b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/activeadmin/activeadmin.git
- revision: ad4caab46f1813bedf5acdb7739a17da546a5609
+ revision: 1e61b4e2bc7a886be73970ff30a1c756e1b7bee1
specs:
activeadmin (1.0.0.pre)
arbre (~> 1.0, >= 1.0.2)
@@ -149,8 +149,8 @@ GEM
formtastic (3.0.0)
actionpack (>= 3.2.13)
formtastic_i18n (0.1.1)
- geocoder (1.2.5)
- guard (2.8.1)
+ geocoder (1.2.6)
+ guard (2.8.2)
formatador (>= 0.2.4)
listen (~> 2.7)
lumberjack (~> 1.0)
@@ -284,9 +284,9 @@ GEM
ref (1.0.5)
responders (1.1.2)
railties (>= 3.2, < 4.2)
- rubocop (0.27.0)
+ rubocop (0.27.1)
astrolabe (~> 1.3)
- parser (>= 2.2.0.pre.6, < 3.0)
+ parser (>= 2.2.0.pre.7, < 3.0)
powerpack (~> 0.0.6)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.4)
@@ -347,7 +347,7 @@ GEM
tinymce-rails (~> 4.0)
turbolinks (2.5.1)
coffee-rails
- twitter (5.12.0)
+ twitter (5.13.0)
addressable (~> 2.3)
buftok (~> 0.2.0)
equalizer (~> 0.0.9)
--
GitLab