Merge branch 'pr-160'

This commit is contained in:
cktricky
2014-10-14 16:37:45 -04:00
+5 -5
View File
@@ -41,7 +41,7 @@ GEM
rack (>= 0.9.0) rack (>= 0.9.0)
binding_of_caller (0.7.2) binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
brakeman (2.6.2) brakeman (2.6.3)
erubis (~> 2.6) erubis (~> 2.6)
fastercsv (~> 1.5) fastercsv (~> 1.5)
haml (>= 3.0, < 5.0) haml (>= 3.0, < 5.0)
@@ -56,7 +56,7 @@ GEM
bundler-audit (0.3.1) bundler-audit (0.3.1)
bundler (~> 1.2) bundler (~> 1.2)
thor (~> 0.18) thor (~> 0.18)
capybara (2.4.3) capybara (2.4.4)
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
rack (>= 1.0.0) rack (>= 1.0.0)
@@ -64,7 +64,7 @@ GEM
xpath (~> 2.0) xpath (~> 2.0)
celluloid (0.16.0) celluloid (0.16.0)
timers (~> 4.0.0) timers (~> 4.0.0)
childprocess (0.5.4) childprocess (0.5.5)
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)
@@ -96,7 +96,7 @@ GEM
eventmachine (1.0.3) eventmachine (1.0.3)
execjs (2.2.1) execjs (2.2.1)
fastercsv (1.5.5) fastercsv (1.5.5)
ffi (1.9.5) ffi (1.9.6)
foreman (0.75.0) foreman (0.75.0)
dotenv (~> 0.11.1) dotenv (~> 0.11.1)
thor (~> 0.19.1) thor (~> 0.19.1)
@@ -292,7 +292,7 @@ GEM
kgio (~> 2.6) kgio (~> 2.6)
rack rack
raindrops (~> 0.7) raindrops (~> 0.7)
websocket-driver (0.3.4) websocket-driver (0.3.5)
xpath (2.0.0) xpath (2.0.0)
nokogiri (~> 1.3) nokogiri (~> 1.3)