From 663b43f1a0f63113dacd94a7b3043acf5aa10705 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Tue, 28 Apr 2015 03:44:55 -0700 Subject: [PATCH] deps update --- Gemfile.lock | 71 +++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 37 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9aeb006..9ee2fff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/thoughtbot/paperclip.git - revision: cdbc05eb508ad18a1fff746d2c4fa58c177ee837 + revision: 55ce56026fe38ab88e59eb5709c6350e18dd33cd specs: paperclip (4.2.1) activemodel (>= 3.0.0) @@ -80,9 +80,9 @@ GEM sass (~> 3.0) terminal-table (~> 1.4) builder (3.2.2) - bullet (4.14.4) + bullet (4.14.5) activesupport (>= 3.0.0) - uniform_notifier (>= 1.6.0) + uniform_notifier (~> 1.9.0) byebug (4.0.5) columnize (= 0.9.0) cane (2.6.2) @@ -115,19 +115,19 @@ GEM coffee-rails (4.1.0) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.3.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1) + coffee-script-source (1.9.1.1) colored (1.2) columnize (0.9.0) concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) - coveralls (0.8.0) - multi_json (~> 1.10) + coveralls (0.8.1) + json (~> 1.8) rest-client (>= 1.6.8, < 2) - simplecov (~> 0.9.1) + simplecov (~> 0.10.0) term-ansicolor (~> 1.3) thor (~> 0.19.1) cucumber (1.3.19) @@ -153,11 +153,11 @@ GEM warden (~> 1.2.3) diff-lcs (1.2.5) docile (1.1.5) - domain_name (0.5.23) + domain_name (0.5.24) unf (>= 0.0.5, < 1.0.0) equalizer (0.0.11) erubis (2.7.0) - execjs (2.4.0) + execjs (2.5.2) factory_girl (4.5.0) activesupport (>= 3.0.0) factory_girl_rails (4.5.0) @@ -175,12 +175,11 @@ GEM sexp_processor (~> 4.4) gherkin (2.12.2) multi_json (~> 1.3) - globalid (0.3.3) + globalid (0.3.5) activesupport (>= 4.1.0) haml (4.0.6) tilt highline (1.6.21) - hike (1.2.3) hirb (0.7.3) http-cookie (1.0.2) domain_name (~> 0.5) @@ -221,9 +220,9 @@ GEM reek (~> 1.3, >= 1.3.4) roodi (~> 3.1) metric_fu-Saikuro (1.1.3) - mime-types (2.4.3) + mime-types (2.5) mini_portile (0.6.2) - minitest (5.5.1) + minitest (5.6.1) multi_json (1.11.0) multi_test (0.1.2) netrc (0.10.3) @@ -231,7 +230,7 @@ GEM mini_portile (~> 0.6.0) orm_adapter (0.5.0) parallel (1.4.1) - parser (2.2.2.1) + parser (2.2.0.4) ast (>= 1.1, < 3.0) pg (0.18.1) powerpack (0.1.0) @@ -285,10 +284,10 @@ GEM rake (10.4.2) rdoc (4.2.0) redcard (1.1.0) - reek (1.6.2) + reek (1.6.6) parser (~> 2.2.0.pre.7) rainbow (>= 1.99, < 3.0) - unparser (= 0.1.16) + unparser (~> 0.2.2) require_all (1.3.2) responders (2.1.0) railties (>= 4.2.0, < 5) @@ -315,17 +314,17 @@ GEM rspec-mocks (~> 3.2.0) rspec-support (~> 3.2.0) rspec-support (3.2.2) - rubocop (0.30.1) + rubocop (0.30.0) astrolabe (~> 1.3) - parser (>= 2.2.2.1, < 3.0) + parser (>= 2.2.0.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) ruby-progressbar (1.7.5) - ruby2ruby (2.1.3) + ruby2ruby (2.1.4) ruby_parser (~> 3.1) sexp_processor (~> 4.0) - ruby_parser (3.6.5) + ruby_parser (3.6.6) sexp_processor (~> 4.1) sass (3.4.13) sass-rails (5.0.3) @@ -337,24 +336,21 @@ GEM sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - sexp_processor (4.5.0) + sexp_processor (4.5.1) shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - simple_token_authentication (1.8.0) + simple_token_authentication (1.9.0) actionmailer (>= 3.2.6, < 5) actionpack (>= 3.2.6, < 5) devise (~> 3.2) - simplecov (0.9.2) + simplecov (0.10.0) docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.9.0) - simplecov-html (0.9.0) - spring (1.3.3) - sprockets (2.12.3) - hike (~> 1.2) - multi_json (~> 1.0) + json (~> 1.8) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) + spring (1.3.4) + sprockets (3.0.3) rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) sprockets-rails (2.2.4) actionpack (>= 3.0) activesupport (>= 3.0) @@ -366,7 +362,7 @@ GEM thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) - tins (1.3.5) + tins (1.5.1) turbolinks (2.5.3) coffee-rails tzinfo (1.2.2) @@ -376,14 +372,15 @@ GEM json (>= 1.8.0) unf (0.1.4) unf_ext - unf_ext (0.0.6) - uniform_notifier (1.8.0) - unparser (0.1.16) + unf_ext (0.0.7.1) + uniform_notifier (1.9.0) + unparser (0.2.2) abstract_type (~> 0.0.7) adamantium (~> 0.2.0) concord (~> 0.1.5) + diff-lcs (~> 1.2.5) equalizer (~> 0.0.9) - parser (~> 2.2.0.pre.7) + parser (~> 2.2.0.2) procto (~> 0.0.2) warden (1.2.3) rack (>= 1.0)