Permalink
Browse files

WIP: Upgrade to 4.2.0

Currently one failure surrounding MiniTest
  • Loading branch information...
1 parent 5b099f6 commit f64f4ee7240c89ac87c7c559f321534320812057 @joshuaclayton joshuaclayton committed Jan 25, 2013
Showing with 27 additions and 27 deletions.
  1. +1 −1 factory_girl_rails.gemspec
  2. +8 −8 gemfiles/rails3.0.gemfile.lock
  3. +9 −9 gemfiles/rails3.1.gemfile.lock
  4. +9 −9 gemfiles/rails3.2.gemfile.lock
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
s.require_paths = ["lib"]
s.add_runtime_dependency('railties', '>= 3.0.0')
- s.add_runtime_dependency('factory_girl', '~> 4.1.0')
+ s.add_runtime_dependency('factory_girl', '~> 4.2.0')
s.add_development_dependency('appraisal', '~> 0.5.0')
s.add_development_dependency('rake')
@@ -1,8 +1,8 @@
PATH
- remote: /Users/mjankowski/Development/OpenSource/factory_girl_rails
+ remote: /Users/joshuaclayton/dev/gems/factory_girl_rails
specs:
factory_girl_rails (4.1.0)
- factory_girl (~> 4.1.0)
+ factory_girl (~> 4.2.0)
railties (>= 3.0.0)
GEM
@@ -54,9 +54,9 @@ GEM
diff-lcs (1.1.3)
erubis (2.6.6)
abstract (>= 1.0.0)
- factory_girl (4.1.0)
+ factory_girl (4.2.0)
activesupport (>= 3.0.0)
- ffi (1.2.0)
+ ffi (1.3.1)
gherkin (2.11.5)
json (>= 1.4.6)
i18n (0.5.0)
@@ -70,12 +70,12 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
- minitest (4.3.3)
+ minitest (4.4.0)
minitest-rails (0.3)
minitest (~> 4.0)
rails (~> 3.0)
polyglot (0.3.3)
- rack (1.2.5)
+ rack (1.2.7)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
@@ -105,12 +105,12 @@ GEM
rspec-expectations (2.11.3)
diff-lcs (~> 1.1.3)
rspec-mocks (2.11.3)
- rspec-rails (2.11.0)
+ rspec-rails (2.11.4)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec (~> 2.11.0)
- sqlite3 (1.3.6)
+ sqlite3 (1.3.7)
therubyrhino (2.0.2)
therubyrhino_jar (>= 1.7.3)
therubyrhino_jar (1.7.4)
@@ -1,8 +1,8 @@
PATH
- remote: /Users/mjankowski/Development/OpenSource/factory_girl_rails
+ remote: /Users/joshuaclayton/dev/gems/factory_girl_rails
specs:
factory_girl_rails (4.1.0)
- factory_girl (~> 4.1.0)
+ factory_girl (~> 4.2.0)
railties (>= 3.0.0)
GEM
@@ -63,9 +63,9 @@ GEM
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
- factory_girl (4.1.0)
+ factory_girl (4.2.0)
activesupport (>= 3.0.0)
- ffi (1.2.0)
+ ffi (1.3.1)
gherkin (2.11.5)
json (>= 1.4.6)
hike (1.2.1)
@@ -79,13 +79,13 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
- minitest (4.3.3)
+ minitest (4.4.0)
minitest-rails (0.3)
minitest (~> 4.0)
rails (~> 3.0)
multi_json (1.2.0)
polyglot (0.3.3)
- rack (1.3.6)
+ rack (1.3.9)
rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
@@ -120,13 +120,13 @@ GEM
rspec-expectations (2.11.3)
diff-lcs (~> 1.1.3)
rspec-mocks (2.11.3)
- rspec-rails (2.11.0)
+ rspec-rails (2.11.4)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec (~> 2.11.0)
sass (3.2.5)
- sass-rails (3.1.6)
+ sass-rails (3.1.7)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
sass (>= 3.1.10)
@@ -135,7 +135,7 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.6)
+ sqlite3 (1.3.7)
therubyrhino (2.0.2)
therubyrhino_jar (>= 1.7.3)
therubyrhino_jar (1.7.4)
@@ -1,8 +1,8 @@
PATH
- remote: /Users/mjankowski/Development/OpenSource/factory_girl_rails
+ remote: /Users/joshuaclayton/dev/gems/factory_girl_rails
specs:
factory_girl_rails (4.1.0)
- factory_girl (~> 4.1.0)
+ factory_girl (~> 4.2.0)
railties (>= 3.0.0)
GEM
@@ -62,9 +62,9 @@ GEM
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
- factory_girl (4.1.0)
+ factory_girl (4.2.0)
activesupport (>= 3.0.0)
- ffi (1.2.0)
+ ffi (1.3.1)
gherkin (2.11.5)
json (>= 1.4.6)
hike (1.2.1)
@@ -79,13 +79,13 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
- minitest (4.3.3)
+ minitest (4.4.0)
minitest-rails (0.3)
minitest (~> 4.0)
rails (~> 3.0)
multi_json (1.5.0)
polyglot (0.3.3)
- rack (1.4.2)
+ rack (1.4.4)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
@@ -118,13 +118,13 @@ GEM
rspec-expectations (2.11.3)
diff-lcs (~> 1.1.3)
rspec-mocks (2.11.3)
- rspec-rails (2.11.0)
+ rspec-rails (2.11.4)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec (~> 2.11.0)
sass (3.2.5)
- sass-rails (3.2.5)
+ sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
@@ -133,7 +133,7 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.6)
+ sqlite3 (1.3.7)
therubyrhino (2.0.2)
therubyrhino_jar (>= 1.7.3)
therubyrhino_jar (1.7.4)

0 comments on commit f64f4ee

Please sign in to comment.