Skip to content

Commit

Permalink
Travis, this is for you. Fail for me
Browse files Browse the repository at this point in the history
  • Loading branch information
jordanbyron committed May 12, 2012
1 parent 7889af9 commit 75d1942
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 15 deletions.
6 changes: 3 additions & 3 deletions Gemfile
Expand Up @@ -32,13 +32,13 @@ group :assets do
end end


group :test do group :test do
gem "minitest", "~> 2.3.1" gem "minitest", "~> 2.12.1"
gem "capybara" gem "capybara"
gem "factory_girl_rails" gem "factory_girl_rails"
gem "colorific", "~> 1.0.0"
gem "test_notifier", "~> 1.0.0"
gem "capybara-webkit" gem "capybara-webkit"
gem "database_cleaner" gem "database_cleaner"
gem "test_notifier", "~> 1.0.0"
gem "turn", "~> 0.9.5"
end end


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

0 comments on commit 75d1942

Please sign in to comment.