From 2cd523cacaca823090b468f41dc7b075528197d2 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Sat, 6 Sep 2014 15:51:34 -0400 Subject: [PATCH] upgraded 5+ gems by rebuilding Gemfile.lock file --- Gemfile.lock | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index dd41ff8..b464d0b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -62,8 +62,8 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - celluloid (0.15.2) - timers (~> 1.1.0) + celluloid (0.16.0) + timers (~> 4.0.0) childprocess (0.5.3) ffi (~> 1.0, >= 1.0.11) cliver (0.3.2) @@ -130,13 +130,14 @@ GEM tilt highline (1.6.21) hike (1.2.3) + hitimes (1.2.2) http_parser.rb (0.6.0) i18n (0.6.11) journey (1.0.4) jquery-fileupload-rails (0.4.1) actionpack (>= 3.1) railties (>= 3.1) - jquery-rails (3.1.1) + jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) @@ -236,7 +237,7 @@ GEM sexp_processor (~> 4.0) ruby_parser (3.5.0) sexp_processor (~> 4.1) - sass (3.4.2) + sass (3.4.3) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) @@ -275,7 +276,8 @@ GEM rack (>= 1.0.0) thor (0.19.1) tilt (1.4.1) - timers (1.1.0) + timers (4.0.0) + hitimes travis-lint (2.0.0) json treetop (1.4.15)