From e749a62fa23de43e44f9b3f0933c3f76cf227326 Mon Sep 17 00:00:00 2001 From: echarp Date: Sat, 2 Jul 2016 17:48:08 +0200 Subject: [PATCH] Bundle update --- Gemfile.lock | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7f72256e..7fb7371b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -46,7 +46,7 @@ GEM rails-html-sanitizer (~> 1.0, >= 1.0.2) actionview-encoded_mail_to (1.0.7) rails - activeadmin (1.0.0.pre3) + activeadmin (1.0.0.pre1) arbre (~> 1.0, >= 1.0.2) bourbon coffee-rails @@ -54,12 +54,11 @@ GEM formtastic_i18n inherited_resources (~> 1.6) jquery-rails - jquery-ui-rails + jquery-ui-rails (~> 5.0) kaminari (~> 0.15) rails (>= 3.2, < 5.0) ransack (~> 1.3) sass-rails - sprockets (< 4) activeadmin_pagedown (0.0.2) activeadmin (>= 0.5.0) activejob (4.2.6) @@ -79,7 +78,7 @@ GEM thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.4.0) - arbre (1.0.3) + arbre (1.1.1) activesupport (>= 3.0.0) arel (6.0.3) ast (2.3.0) @@ -342,8 +341,8 @@ GEM ruby_parser (3.8.2) sexp_processor (~> 4.1) sass (3.4.22) - sass-rails (5.0.4) - railties (>= 4.0.0, < 5.0) + sass-rails (5.0.5) + railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) @@ -364,8 +363,8 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slop (3.6.0) - spring (1.7.1) - sprockets (3.6.2) + spring (1.7.2) + sprockets (3.6.3) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.1.1)