Permalink
Browse files

Updated gem dependencies to resolve conflicts

  • Loading branch information...
1 parent 8c5b679 commit 483c4be28623499998d5a7cd4dbd7208992e3ddf @avit committed Feb 29, 2012
Showing with 39 additions and 39 deletions.
  1. +1 −1 Gemfile
  2. +38 −38 Gemfile.lock
View
@@ -76,7 +76,7 @@ end
group :test do
gem 'spork'
- gem 'factory_girl_rails', '~> 1.6.0'
+ gem 'factory_girl_rails'
gem 'simplecov', :platform => :mri_19 unless ENV["CI"] # Until Travis supports build artifacts
gem 'fuubar'
gem 'database_cleaner'
View
@@ -47,17 +47,17 @@ GEM
activesupport (= 3.1.3)
activesupport (3.1.3)
multi_json (~> 1.0)
- acts-as-taggable-on (2.2.1)
- rails (~> 3.1)
+ acts-as-taggable-on (2.2.2)
+ rails (~> 3.0)
acts_as_commentable (3.0.1)
- acts_as_list (0.1.4)
- addressable (2.2.6)
+ acts_as_list (0.1.5)
+ addressable (2.2.7)
ajax-chosen-rails (0.1.5)
chosen-rails
railties (~> 3.0)
thor (~> 0.14)
annotate (2.4.1.beta1)
- arel (2.2.1)
+ arel (2.2.3)
authlogic (3.1.0)
activerecord (>= 3.0.7)
activerecord (>= 3.0.7)
@@ -82,42 +82,42 @@ GEM
execjs
coffee-script-source (1.2.0)
columnize (0.3.6)
- daemons (1.1.5)
+ daemons (1.1.8)
database_cleaner (0.7.1)
diff-lcs (1.1.3)
em-websocket (0.3.6)
addressable (>= 2.1.1)
eventmachine (>= 0.12.9)
erubis (2.7.0)
eventmachine (0.12.10)
- execjs (1.2.13)
+ execjs (1.3.0)
multi_json (~> 1.0)
- factory_girl (2.5.0)
- activesupport
- factory_girl_rails (1.6.0)
- factory_girl (~> 2.5.0)
+ factory_girl (2.6.0)
+ activesupport (>= 2.3.9)
+ factory_girl_rails (1.7.0)
+ factory_girl (~> 2.6.0)
railties (>= 3.0.0)
- ffaker (1.12.1)
+ ffaker (1.13.0)
ffi (1.0.11)
- fuubar (0.0.6)
+ fuubar (1.0.0)
rspec (~> 2.0)
- rspec-instafail (~> 0.1.8)
+ rspec-instafail (~> 0.2.0)
ruby-progressbar (~> 0.0.10)
- guard (0.10.0)
+ guard (1.0.0)
ffi (>= 0.5.0)
thor (~> 0.14.6)
- guard-livereload (0.4.0)
+ guard-livereload (0.4.2)
em-websocket (>= 0.2.0)
guard (>= 0.10.0)
- multi_json (~> 1.0.3)
- guard-rails (0.0.3)
+ multi_json (~> 1.0)
+ guard-rails (0.1.0)
guard (>= 0.2.2)
guard-rspec (0.6.0)
guard (>= 0.10.0)
guard-sass (0.5.4)
guard (>= 0.4.0)
sass (>= 3.1)
- guard-spork (0.5.1)
+ guard-spork (0.5.2)
guard (>= 0.10.0)
spork (>= 0.8.4)
haml (3.1.4)
@@ -128,7 +128,7 @@ GEM
railties (~> 3.0)
thor (~> 0.14)
json (1.6.5)
- kgio (2.7.0)
+ kgio (2.7.2)
libv8 (3.3.10.4)
linecache (0.46)
rbx-require-relative (> 0.0.4)
@@ -137,7 +137,7 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.17.2)
- multi_json (1.0.4)
+ multi_json (1.1.0)
mysql2 (0.3.10)
nokogiri (1.5.0)
paperclip (2.5.2)
@@ -177,7 +177,7 @@ GEM
thor (~> 0.14.6)
raindrops (0.8.0)
rake (0.9.2.2)
- rbx-require-relative (0.0.5)
+ rbx-require-relative (0.0.9)
rdoc (3.12)
json (~> 1.4)
rspec (2.8.0)
@@ -187,7 +187,7 @@ GEM
rspec-core (2.8.0)
rspec-expectations (2.8.0)
diff-lcs (~> 1.1.2)
- rspec-instafail (0.1.9)
+ rspec-instafail (0.2.2)
rspec-mocks (2.8.0)
rspec-rails (2.8.1)
actionpack (>= 3.0)
@@ -202,25 +202,25 @@ GEM
ruby-progressbar (0.0.10)
ruby_gntp (0.3.4)
rubyzip (0.9.6.1)
- sass (3.1.12)
+ sass (3.1.15)
sass-rails (3.1.5)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
sass (~> 3.1.10)
tilt (~> 1.3.2)
- selenium-webdriver (2.19.0)
+ selenium-webdriver (2.20.0)
childprocess (>= 0.2.5)
- ffi (~> 1.0.9)
- multi_json (~> 1.0.4)
+ ffi (~> 1.0)
+ multi_json (~> 1.0)
rubyzip
simple_form (1.5.2)
actionpack (~> 3.0)
activemodel (~> 3.0)
- simplecov (0.5.4)
- multi_json (~> 1.0.3)
+ simplecov (0.6.1)
+ multi_json (~> 1.0)
simplecov-html (~> 0.5.3)
simplecov-html (0.5.3)
- spork (0.8.5)
+ spork (0.9.0)
sprockets (2.0.3)
hike (~> 1.2)
rack (~> 1.0)
@@ -229,8 +229,8 @@ GEM
steak (2.0.0)
capybara (>= 1.0.0)
rspec-rails (>= 2.5.0)
- test-unit (2.4.4)
- therubyracer (0.9.9)
+ test-unit (2.4.7)
+ therubyracer (0.9.10)
libv8 (~> 3.3.10)
thin (1.3.1)
daemons (>= 1.0.9)
@@ -242,14 +242,14 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.31)
- uglifier (1.2.1)
+ uglifier (1.2.3)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
- unicorn (4.1.1)
- kgio (~> 2.4)
+ unicorn (4.2.0)
+ kgio (~> 2.6)
rack
- raindrops (~> 0.6)
- will_paginate (3.0.2)
+ raindrops (~> 0.7)
+ will_paginate (3.0.3)
xpath (0.1.4)
nokogiri (~> 1.3)
yajl-ruby (1.1.0)
@@ -269,7 +269,7 @@ DEPENDENCIES
coffee-rails (>= 3.1.1)
database_cleaner
factory_girl
- factory_girl_rails (~> 1.6.0)
+ factory_girl_rails
ffaker (>= 1.12.0)
fuubar
guard

0 comments on commit 483c4be

Please sign in to comment.