Merge pull request #173 from jasnow/master

Upgraded 7 gems by rebuilding Gemfile.lock file
This commit is contained in:
Ken Johnson
2014-11-17 08:12:53 -05:00
+7 -7
View File
@@ -108,7 +108,7 @@ GEM
trollop (~> 2.0)
gherkin (2.12.2)
multi_json (~> 1.3)
guard (2.7.0)
guard (2.8.2)
formatador (>= 0.2.4)
listen (~> 2.7)
lumberjack (~> 1.0)
@@ -124,8 +124,8 @@ GEM
guard-rspec (4.3.1)
guard (~> 2.1)
rspec (>= 2.14, < 4.0)
guard-shell (0.6.1)
guard (>= 1.1.0)
guard-shell (0.7.0)
guard (>= 2.0.0)
haml (4.0.5)
tilt
highline (1.6.21)
@@ -142,7 +142,7 @@ GEM
thor (>= 0.14, < 2.0)
json (1.8.1)
kgio (2.9.2)
launchy (2.4.2)
launchy (2.4.3)
addressable (~> 2.3)
libv8 (3.16.14.7)
listen (2.7.11)
@@ -237,7 +237,7 @@ GEM
sexp_processor (~> 4.0)
ruby_parser (3.5.0)
sexp_processor (~> 4.1)
sass (3.4.6)
sass (3.4.7)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
@@ -264,7 +264,7 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.9)
sqlite3 (1.3.10)
temple (0.6.10)
terminal-table (1.4.5)
therubyracer (0.12.1)
@@ -292,7 +292,7 @@ GEM
kgio (~> 2.6)
rack
raindrops (~> 0.7)
websocket-driver (0.3.5)
websocket-driver (0.4.0)
xpath (2.0.0)
nokogiri (~> 1.3)