From 4ad54f601fcb3036d0e1c0b99e3f54593c50fc73 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 23 Sep 2015 17:10:15 +1000 Subject: [PATCH] more gem updates --- Gemfile.lock | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6cd3e47806d..bacc70fb12f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,9 +43,9 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - annotate (2.6.6) - activerecord (>= 2.3.0) - rake (~> 10.4.2, >= 10.4.2) + annotate (2.6.10) + activerecord (>= 3.2, <= 4.3) + rake (~> 10.4) arel (6.0.3) aws-sdk (2.0.45) aws-sdk-resources (= 2.0.45) @@ -69,8 +69,7 @@ GEM binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) builder (3.2.2) - byebug (5.0.0) - columnize (= 0.9.0) + byebug (6.0.2) celluloid (0.17.1.2) bundler celluloid-essentials @@ -114,7 +113,6 @@ GEM timers (>= 4.1.1) certified (1.0.0) coderay (1.1.0) - columnize (0.9.0) connection_pool (2.2.0) crass (1.0.2) daemons (1.2.3) @@ -140,9 +138,9 @@ GEM ember-source (1.12.1) erubis (2.7.0) eventmachine (1.0.8) - excon (0.45.3) + excon (0.45.4) execjs (2.6.0) - exifr (1.2.2) + exifr (1.2.3.1) fabrication (2.9.8) fakeweb (1.3.0) faraday (0.9.1) @@ -174,7 +172,7 @@ GEM hike (1.2.3) hiredis (0.6.0) hitimes (1.2.3) - htmlentities (4.3.3) + htmlentities (4.3.4) i18n (0.7.0) image_optim (0.20.2) exifr (~> 1.1, >= 1.1.3) @@ -184,8 +182,7 @@ GEM progress (~> 3.0, >= 3.0.1) image_size (1.4.1) in_threads (1.3.1) - jmespath (1.0.2) - multi_json (~> 1.0) + jmespath (1.1.3) jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) @@ -225,7 +222,7 @@ GEM netrc (0.10.3) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) - nokogumbo (1.2.0) + nokogumbo (1.4.1) nokogiri oauth (0.4.7) oauth2 (1.0.0) @@ -281,7 +278,7 @@ GEM puma (2.14.0) r2 (0.2.5) rack (1.6.4) - rack-mini-profiler (0.9.6) + rack-mini-profiler (0.9.7) rack (>= 1.1.3) rack-openid (1.3.1) rack (>= 1.1.0) @@ -320,14 +317,14 @@ GEM rake (10.4.2) rake-compiler (0.9.4) rake - rb-fsevent (0.9.4) + rb-fsevent (0.9.6) rb-inotify (0.9.5) ffi (>= 0.5.0) rbtrace (0.4.7) ffi (>= 1.0.6) msgpack (>= 0.4.3) trollop (>= 1.16.2) - redcarpet (3.2.2) + redcarpet (3.3.2) redis (3.2.1) redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) @@ -367,10 +364,10 @@ GEM ruby-readability (0.7.0) guess_html_encoding (>= 0.0.4) nokogiri (>= 1.6.0) - sanitize (3.1.2) - crass (~> 1.0.1) + sanitize (4.0.0) + crass (~> 1.0.2) nokogiri (>= 1.4.4) - nokogumbo (= 1.2.0) + nokogumbo (= 1.4.1) sass (3.2.19) sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) @@ -430,7 +427,7 @@ GEM thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) - timecop (0.7.3) + timecop (0.8.0) timers (4.1.1) hitimes trollop (2.1.1)