Permalink
Browse files

Travis, this is for you. Fail for me

  • Loading branch information...
jordanbyron committed May 12, 2012
1 parent 7889af9 commit 75d1942a1adc126bdb082d9b0d0c589e4fd8aa4c
Showing with 14 additions and 15 deletions.
  1. +3 −3 Gemfile
  2. +11 −12 Gemfile.lock
View
@@ -32,13 +32,13 @@ group :assets do
end
group :test do
- gem "minitest", "~> 2.3.1"
+ gem "minitest", "~> 2.12.1"
gem "capybara"
gem "factory_girl_rails"
- gem "colorific", "~> 1.0.0"
- gem "test_notifier", "~> 1.0.0"
gem "capybara-webkit"
gem "database_cleaner"
+ gem "test_notifier", "~> 1.0.0"
+ gem "turn", "~> 0.9.5"
end
group :production do
View
@@ -32,6 +32,7 @@ GEM
addressable (2.2.4)
albino (1.3.3)
posix-spawn (>= 0.3.6)
+ ansi (1.4.2)
arel (2.2.3)
builder (3.0.0)
capistrano (2.9.0)
@@ -63,9 +64,6 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.2.0)
- colorific (1.0.0)
- minitest (~> 2.3.1)
- ruby-progressbar (~> 0.0.10)
compass (0.12.rc.1)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
@@ -106,9 +104,9 @@ GEM
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
- json (1.6.5)
+ json (1.7.3)
json_pure (1.6.1)
- mail (2.3.2)
+ mail (2.3.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
@@ -120,8 +118,8 @@ GEM
md_preview (0.0.3)
rails (~> 3.1.3)
redcarpet (>= 2.0.0)
- mime-types (1.17.2)
- minitest (2.3.1)
+ mime-types (1.18)
+ minitest (2.12.1)
multi_json (1.0.4)
multi_xml (0.2.2)
multipart-post (1.1.3)
@@ -212,7 +210,6 @@ GEM
ruby-openid (2.1.8)
ruby-openid-apps-discovery (1.2.0)
ruby-openid (>= 2.1.7)
- ruby-progressbar (0.0.10)
rubyntlm (0.1.1)
rubyzip (0.9.4)
sass (3.1.7)
@@ -229,7 +226,7 @@ GEM
ffi (>= 1.0.7)
json_pure
rubyzip
- sprockets (2.0.3)
+ sprockets (2.0.4)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
@@ -240,7 +237,9 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.32)
+ turn (0.9.5)
+ ansi
+ tzinfo (0.3.33)
uglifier (1.2.1)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
@@ -257,7 +256,6 @@ DEPENDENCIES
capybara-webkit
coffee-filter (~> 0.1.1)
coffee-rails (~> 3.1.0)
- colorific (~> 1.0.0)
compass-rails
database_cleaner
delayed_mailhopper
@@ -271,7 +269,7 @@ DEPENDENCIES
mailhopper (~> 0.0.4)
md_emoji
md_preview
- minitest (~> 2.3.1)
+ minitest (~> 2.12.1)
nokogiri
omniauth
pg
@@ -281,4 +279,5 @@ DEPENDENCIES
sass-rails (~> 3.1.0)
sassy-buttons
test_notifier (~> 1.0.0)
+ turn (~> 0.9.5)
uglifier

0 comments on commit 75d1942

Please sign in to comment.