Changeset [ac407b0da02a956e527a767109f7ac545f5de618] by Dan Kubb

January 8th, 2015 @ 03:05 AM

Merge branch 'master' into release-1.2

Conflicts:
Gemfile VERSION dm-rails.gemspec lib/dm-rails/mass_assignment_security.rb spec/unit/mass_assignment_security_spec.rb https://github.com/datamapper/dm-rails/commit/ac407b0da02a956e527a7...

Committed by Dan Kubb

  • A lib/dm-rails/version.rb
  • R VERSION
  • M Gemfile
  • M README.rdoc
  • M Rakefile
  • M dm-rails.gemspec
  • M lib/dm-rails/configuration.rb
  • M lib/dm-rails/session_store.rb
  • M spec/unit/mass_assignment_security_spec.rb
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile »