From 510d2c810d8d94ae79fb96cec8bfa031019cdf3e Mon Sep 17 00:00:00 2001 From: echarp Date: Sun, 15 Feb 2015 12:06:29 +0100 Subject: [PATCH] Bundle update --- Gemfile.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5ab217ab..6c77a256 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/activeadmin/activeadmin.git - revision: b3a9f4b3e4051447d011c59649a73f876989a199 + revision: ed1fbca8c64af827616c58f274d7be256ca513b6 specs: activeadmin (1.0.0.pre) arbre (~> 1.0, >= 1.0.2) @@ -73,7 +73,7 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.3.6) + addressable (2.3.7) arbre (1.0.3) activesupport (>= 3.0.0) arel (6.0.0) @@ -81,8 +81,8 @@ GEM astrolabe (1.3.0) parser (>= 2.2.0.pre.3, < 3.0) bcrypt (3.1.10) - bourbon (4.1.1) - sass (~> 3.3) + bourbon (4.2.0) + sass (~> 3.4) thor brakeman (3.0.1) erubis (~> 2.6) @@ -140,8 +140,8 @@ GEM activemodel equalizer (0.0.9) erubis (2.7.0) - eventmachine (1.0.4) - execjs (2.2.2) + eventmachine (1.0.7) + execjs (2.3.0) faraday (0.9.1) multipart-post (>= 1.2, < 3) fastercsv (1.5.5) @@ -153,9 +153,9 @@ GEM actionpack (>= 3.2.13) formtastic_i18n (0.1.1) geocoder (1.2.7) - globalid (0.3.0) + globalid (0.3.3) activesupport (>= 4.1.0) - guard (2.11.1) + guard (2.12.1) formatador (>= 0.2.4) listen (~> 2.7) lumberjack (~> 1.0) @@ -180,7 +180,7 @@ GEM activerecord (>= 4.1.0) guard (~> 2.3) guard-compat (~> 1.1) - guard-minitest (2.4.2) + guard-minitest (2.4.3) guard-compat (~> 1.2) minitest (>= 3.0) guard-rubocop (1.2.0) @@ -198,7 +198,7 @@ GEM haml (>= 3.1, < 5.0) html2haml (>= 1.0.1) railties (>= 4.0.1) - has_scope (0.6.0.rc) + has_scope (0.6.0) actionpack (>= 3.2, < 5) activesupport (>= 3.2, < 5) highline (1.6.21) @@ -219,7 +219,7 @@ GEM has_scope (~> 0.6.0.rc) railties (>= 3.2, < 5) responders - jbuilder (2.2.6) + jbuilder (2.2.7) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) jquery-rails (4.0.3) @@ -232,7 +232,7 @@ GEM jquery-ui-rails (5.0.3) railties (>= 3.2.16) json (1.8.2) - kaminari (0.16.2) + kaminari (0.16.3) actionpack (>= 3.0.0) activesupport (>= 3.0.0) leaflet-markercluster-rails (0.7.0) @@ -264,15 +264,15 @@ GEM nenv (0.2.0) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) - notiffany (0.0.3) + notiffany (0.0.5) nenv (~> 0.1) shellany (~> 0.0) orm_adapter (0.5.0) - parser (2.2.0.2) + parser (2.2.0.3) ast (>= 1.1, < 3.0) polyamorous (1.1.0) activerecord (>= 3.0) - powerpack (0.0.9) + powerpack (0.1.0) pry (0.10.1) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -326,10 +326,10 @@ GEM ref (1.0.5) responders (2.1.0) railties (>= 4.2.0, < 5) - rubocop (0.28.0) + rubocop (0.29.1) astrolabe (~> 1.3) - parser (>= 2.2.0.pre.7, < 3.0) - powerpack (~> 0.0.6) + parser (>= 2.2.0.1, < 3.0) + powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) ruby-progressbar (1.7.1) @@ -338,7 +338,7 @@ GEM sexp_processor (~> 4.0) ruby_parser (3.5.0) sexp_processor (~> 4.1) - sass (3.4.11) + sass (3.4.12) sass-rails (5.0.1) railties (>= 4.0.0, < 5.0) sass (~> 3.1) @@ -348,11 +348,11 @@ GEM sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - select2-rails (3.5.9.2) + select2-rails (3.5.9.3) thor (~> 0.14) sexp_processor (4.4.5) shellany (0.0.1) - simple_calendar (1.1.9) + simple_calendar (1.1.10) rails (>= 3.0) simple_oauth (0.3.1) simplecov (0.9.1) @@ -361,7 +361,7 @@ GEM simplecov-html (~> 0.8.0) simplecov-html (0.8.0) slop (3.6.0) - spring (1.2.0) + spring (1.3.2) sprockets (2.12.3) hike (~> 1.2) multi_json (~> 1.0) @@ -372,7 +372,7 @@ GEM activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) sqlite3 (1.3.10) - strip_attributes (1.6.0) + strip_attributes (1.7.0) activemodel (>= 3.0, < 5.0) sysexits (1.2.0) terminal-table (1.4.5) @@ -390,7 +390,7 @@ GEM tinymce-rails (~> 4.0) turbolinks (2.5.3) coffee-rails - twitter (5.13.0) + twitter (5.14.0) addressable (~> 2.3) buftok (~> 0.2.0) equalizer (~> 0.0.9)