Merge pull request #129 from jasnow/master

Upgraded 6 gems and then rebuilt Gemfile.lock file
This commit is contained in:
Ken Johnson
2014-06-09 07:18:46 -04:00
+6 -6
View File
@@ -40,14 +40,14 @@ GEM
erubis (>= 2.6.6)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
brakeman (2.5.0)
brakeman (2.6.0)
erubis (~> 2.6)
fastercsv (~> 1.5)
haml (>= 3.0, < 5.0)
highline (~> 1.6.20)
multi_json (~> 1.2)
ruby2ruby (~> 2.0.5)
ruby_parser (~> 3.4.0)
ruby_parser (~> 3.5.0)
sass (~> 3.0)
slim (>= 1.3.6, < 3.0)
terminal-table (~> 1.4)
@@ -93,7 +93,7 @@ GEM
http_parser.rb (~> 0.6.0)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.1.0)
execjs (2.2.0)
fastercsv (1.5.5)
ffi (1.9.3)
foreman (0.71.0)
@@ -144,7 +144,7 @@ GEM
launchy (2.4.2)
addressable (~> 2.3)
libv8 (3.16.14.3)
listen (2.7.6)
listen (2.7.7)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
@@ -211,7 +211,7 @@ GEM
raindrops (0.13.0)
rake (10.3.2)
rb-fsevent (0.9.4)
rb-inotify (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
rdoc (3.12.2)
json (~> 1.4)
@@ -235,7 +235,7 @@ GEM
ruby2ruby (2.0.8)
ruby_parser (~> 3.1)
sexp_processor (~> 4.0)
ruby_parser (3.4.1)
ruby_parser (3.5.0)
sexp_processor (~> 4.1)
safe_yaml (0.9.7)
sass (3.3.8)