Skip to content
This repository has been archived by the owner on Mar 31, 2021. It is now read-only.

Merging upstream changes #1

Merged
merged 46 commits into from Oct 11, 2016
Merged

Merging upstream changes #1

merged 46 commits into from Oct 11, 2016

Conversation

mcmoyer
Copy link

@mcmoyer mcmoyer commented Oct 11, 2016

merging in upstream changes to allow for new rails versions

aserafin and others added 30 commits August 14, 2013 16:02
The description of `rake db:seed_fu` erroneously referred to `rake db:seed`
update `rake db:seed_fu` description (minor)
Add rake task for capistrano3.
Distinguish dynamic variables with static portion of paths.
fix seed-fu for postgresql when there is no primary key defined
Made location of seed data more clear.
* commit 'refs/pull/origin/54':
  Failing test in DB=postgresql
  fix specs in Rails 4
  use rspec
  add rake file
  BUGFIX: if you seed data that has an id < 1 seed-fu attempts to reset the id sequence to an invalid id

Conflicts:
	lib/seed-fu/seeder.rb
	spec/spec_helper.rb
Update dependencies for Rails 4.2
Copy link
Member

@joshuawscott joshuawscott left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@mcmoyer mcmoyer merged commit e4ea0f9 into master Oct 11, 2016
@mcmoyer mcmoyer deleted the merging_upstream_changes branch October 11, 2016 21:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet