Merge pull request #91 from jasnow/master

Upgraded 5+ gems and then rebuilt Gemfile.lock file
This commit is contained in:
mccabe615
2014-02-16 12:54:57 -05:00
+9 -4
View File
@@ -62,7 +62,10 @@ GEM
xpath (~> 2.0) xpath (~> 2.0)
celluloid (0.15.2) celluloid (0.15.2)
timers (~> 1.1.0) timers (~> 1.1.0)
childprocess (0.4.0) celluloid-io (0.15.0)
celluloid (>= 0.15.0)
nio4r (>= 0.5.0)
childprocess (0.4.2)
ffi (~> 1.0, >= 1.0.11) ffi (~> 1.0, >= 1.0.11)
cliver (0.3.2) cliver (0.3.2)
coderay (1.1.0) coderay (1.1.0)
@@ -137,12 +140,13 @@ GEM
railties (>= 3.0, < 5.0) railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (1.8.1) json (1.8.1)
kgio (2.9.1) kgio (2.9.2)
launchy (2.4.2) launchy (2.4.2)
addressable (~> 2.3) addressable (~> 2.3)
libv8 (3.16.14.3) libv8 (3.16.14.3)
listen (2.4.1) listen (2.5.0)
celluloid (>= 0.15.2) celluloid (>= 0.15.2)
celluloid-io (>= 0.15.0)
rb-fsevent (>= 0.9.3) rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9) rb-inotify (>= 0.9)
lumberjack (1.0.4) lumberjack (1.0.4)
@@ -163,6 +167,7 @@ GEM
mime-types (1.25.1) mime-types (1.25.1)
multi_json (1.8.4) multi_json (1.8.4)
multi_test (0.0.3) multi_test (0.0.3)
nio4r (1.0.0)
nokogiri (1.5.11) nokogiri (1.5.11)
poltergeist (1.5.0) poltergeist (1.5.0)
capybara (~> 2.1) capybara (~> 2.1)
@@ -229,7 +234,7 @@ GEM
ruby2ruby (2.0.7) ruby2ruby (2.0.7)
ruby_parser (~> 3.1) ruby_parser (~> 3.1)
sexp_processor (~> 4.0) sexp_processor (~> 4.0)
ruby_parser (3.4.0) ruby_parser (3.4.1)
sexp_processor (~> 4.1) sexp_processor (~> 4.1)
sass (3.2.14) sass (3.2.14)
sass-rails (3.2.6) sass-rails (3.2.6)