From 2bf0833fc4131e49cf5f81696ceaf2a02d03d525 Mon Sep 17 00:00:00 2001 From: nilsding Date: Fri, 28 Nov 2014 19:31:07 +0100 Subject: [PATCH] updated a few gems --- Gemfile.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 05abc76e..a0acdb42 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,13 +29,13 @@ GEM tzinfo (~> 1.1) arel (5.0.1.20140414130214) bcrypt (3.1.9) - bootstrap-material-design (0.1.1) - bootstrap-sass (= 3.2.0.2) + bootstrap-material-design (0.1.3) + bootstrap-sass (~> 3.0) bootstrap-sass (3.2.0.2) sass (~> 3.2) bootstrap_form (2.2.0) builder (3.2.2) - capybara (2.4.3) + capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -79,7 +79,7 @@ GEM hike (1.2.3) http_accept_language (2.0.2) i18n (0.6.11) - jbuilder (2.2.4) + jbuilder (2.2.5) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) jquery-rails (3.1.2) @@ -90,15 +90,15 @@ GEM turbolinks json (1.8.1) kgio (2.9.2) - mail (2.6.1) + mail (2.6.3) mime-types (>= 1.16, < 3) mime-types (2.4.3) - mini_portile (0.6.0) - minitest (5.4.2) + mini_portile (0.6.1) + minitest (5.4.3) multi_json (1.10.1) - mysql2 (0.3.16) - nokogiri (1.6.3.1) - mini_portile (= 0.6.0) + mysql2 (0.3.17) + nokogiri (1.6.5) + mini_portile (~> 0.6.0) nprogress-rails (0.1.6.3) orm_adapter (0.5.0) pg (0.17.1) @@ -126,10 +126,10 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.13.0) - rake (10.3.2) + rake (10.4.0) rdoc (4.1.2) json (~> 1.4) - responders (1.1.1) + responders (1.1.2) railties (>= 3.2, < 4.2) rspec-core (3.0.4) rspec-support (~> 3.0.0) @@ -148,10 +148,10 @@ GEM rspec-support (~> 3.0.0) rspec-support (3.0.4) sass (3.2.19) - sass-rails (4.0.4) + sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) sass (~> 3.2.2) - sprockets (~> 2.8, < 2.12) + sprockets (~> 2.8, < 3.0) sprockets-rails (~> 2.0) sdoc (0.4.1) json (~> 1.7, >= 1.7.7) @@ -161,13 +161,13 @@ GEM multi_json (~> 1.0) simplecov-html (~> 0.8.0) simplecov-html (0.8.0) - spring (1.1.3) - sprockets (2.11.3) + spring (1.2.0) + sprockets (2.12.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.0) + sprockets-rails (2.2.1) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) @@ -178,7 +178,7 @@ GEM thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) - turbolinks (2.5.1) + turbolinks (2.5.2) coffee-rails tzinfo (1.2.2) thread_safe (~> 0.1)