Skip to content

Commit

Permalink
Prepare version 5.2.0 (#478)
Browse files Browse the repository at this point in the history
* Prepare version 5.2.0

* Upgrade database_cleaner for ruby 2.3 compatibility.
  • Loading branch information
mikwat authored and wldcordeiro committed Dec 19, 2017
1 parent bf6b9a1 commit 154748c
Show file tree
Hide file tree
Showing 11 changed files with 60 additions and 41 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.rdoc
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
= 5.2.0 (Dec 14, 2017)
* Fix regression in generator around belongs_to options compatibility
* Update version of database_cleaner
* Update initializer.rb to include the remove_role_if_empty option and description
* Allow inverse_of option on rolify method
* Fix the code-climate-reporter issue that's causing travis to fail
* Remove a separate index for the name column
* Fix migration generator for AR 5.x
* Fixed ambiguous column error

= 5.1.0 (Mar 19, 2016)
* Rails 5 Support (thanks @lorefnon)
* Fix user handling in generator (thanks @lorefnon)
Expand Down
9 changes: 9 additions & 0 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,12 @@ Mauro George (@MauroGeorge)
Cheri Allen(@cherimarie)
Gaurab Paul (@lorefnon)
Dmitry Krakosevich (@DmitryKK)
Michael Watts (@mikwat)
Derek Ethier (@ethier)
Michael (@mibamur)
Undo1 (@Undo1)
Hitabis Engineering (@Hitabis)
Sergey Alekseev (@sergey-alekseev)
Sankalp Kulshreshtha (@sankalpk)
Kirill Sevastyanenko (@kirillseva)
Denis Shevchenko (@SimplySorc)
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ group :test do
gem 'byebug'
gem 'pry-byebug'
gem 'test-unit' # Implicitly loaded by ammeter
gem 'database_cleaner', '~> 1.5.3'
gem 'database_cleaner', '~> 1.6.2'
gem 'codeclimate-test-reporter', :require => nil
end

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2016 Florent Monbillard
Copyright (c) 2017 Florent Monbillard

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down
12 changes: 6 additions & 6 deletions gemfiles/activerecord_3.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

source "https://rubygems.org"

gem "sqlite3", :platform => "ruby"
gem "activerecord", "~> 3.2.0", :require => "active_record"
gem "sqlite3", platform: "ruby"
gem "activerecord", "~> 3.2.0", require: "active_record"

group :test do
gem "appraisal"
gem "coveralls", :require => false
gem "coveralls", require: false
gem "its"
gem "byebug"
gem "pry-byebug"
gem "test-unit"
gem "database_cleaner", "~> 1.5.3"
gem "codeclimate-test-reporter", :require => nil
gem "database_cleaner", "~> 1.6.2"
gem "codeclimate-test-reporter", require: nil
end

gemspec :path => "../"
gemspec path: "../"
12 changes: 6 additions & 6 deletions gemfiles/activerecord_4.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

source "https://rubygems.org"

gem "sqlite3", :platform => "ruby"
gem "activerecord", "~> 4.2.5", :require => "active_record"
gem "sqlite3", platform: "ruby"
gem "activerecord", "~> 4.2.5", require: "active_record"

group :test do
gem "appraisal"
gem "coveralls", :require => false
gem "coveralls", require: false
gem "its"
gem "byebug"
gem "pry-byebug"
gem "test-unit"
gem "database_cleaner", "~> 1.5.3"
gem "codeclimate-test-reporter", :require => nil
gem "database_cleaner", "~> 1.6.2"
gem "codeclimate-test-reporter", require: nil
end

gemspec :path => "../"
gemspec path: "../"
22 changes: 11 additions & 11 deletions gemfiles/activerecord_5.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@

source "https://rubygems.org"

gem "sqlite3", :platform => "ruby"
gem "activerecord", ">= 5.0.0.beta", :require => "active_record"
gem "sqlite3", platform: "ruby"
gem "activerecord", ">= 5.0.0.beta", require: "active_record"
gem "actionpack", ">= 5.0.0.beta2"
gem "activemodel", ">= 5.0.0.beta2"
gem "railties", ">= 5.0.0.beta2"
gem "rspec-rails", :github => "rspec/rspec-rails"
gem "rspec-core", :github => "rspec/rspec-core"
gem "rspec-expectations", :github => "rspec/rspec-expectations"
gem "rspec-mocks", :github => "rspec/rspec-mocks"
gem "rspec-support", :github => "rspec/rspec-support"
gem "rspec-rails", github: "rspec/rspec-rails"
gem "rspec-core", github: "rspec/rspec-core"
gem "rspec-expectations", github: "rspec/rspec-expectations"
gem "rspec-mocks", github: "rspec/rspec-mocks"
gem "rspec-support", github: "rspec/rspec-support"

group :test do
gem "appraisal"
gem "coveralls", :require => false
gem "coveralls", require: false
gem "its"
gem "byebug"
gem "pry-byebug"
gem "test-unit"
gem "database_cleaner", "~> 1.5.3"
gem "codeclimate-test-reporter", :require => nil
gem "database_cleaner", "~> 1.6.2"
gem "codeclimate-test-reporter", require: nil
end

gemspec :path => "../"
gemspec path: "../"
10 changes: 5 additions & 5 deletions gemfiles/mongoid_3.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
source "https://rubygems.org"

gem "mongoid", "~> 3"
gem "bson_ext", :platform => "ruby"
gem "bson_ext", platform: "ruby"

group :test do
gem "appraisal"
gem "coveralls", :require => false
gem "coveralls", require: false
gem "its"
gem "byebug"
gem "pry-byebug"
gem "test-unit"
gem "database_cleaner", "~> 1.5.3"
gem "codeclimate-test-reporter", :require => nil
gem "database_cleaner", "~> 1.6.2"
gem "codeclimate-test-reporter", require: nil
end

gemspec :path => "../"
gemspec path: "../"
10 changes: 5 additions & 5 deletions gemfiles/mongoid_4.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
source "https://rubygems.org"

gem "mongoid", "~> 4"
gem "bson_ext", :platform => "ruby"
gem "bson_ext", platform: "ruby"

group :test do
gem "appraisal"
gem "coveralls", :require => false
gem "coveralls", require: false
gem "its"
gem "byebug"
gem "pry-byebug"
gem "test-unit"
gem "database_cleaner", "~> 1.5.3"
gem "codeclimate-test-reporter", :require => nil
gem "database_cleaner", "~> 1.6.2"
gem "codeclimate-test-reporter", require: nil
end

gemspec :path => "../"
gemspec path: "../"
10 changes: 5 additions & 5 deletions gemfiles/mongoid_5.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
source "https://rubygems.org"

gem "mongoid", "~> 5"
gem "bson_ext", :platform => "ruby"
gem "bson_ext", platform: "ruby"

group :test do
gem "appraisal"
gem "coveralls", :require => false
gem "coveralls", require: false
gem "its"
gem "byebug"
gem "pry-byebug"
gem "test-unit"
gem "database_cleaner", "~> 1.5.3"
gem "codeclimate-test-reporter", :require => nil
gem "database_cleaner", "~> 1.6.2"
gem "codeclimate-test-reporter", require: nil
end

gemspec :path => "../"
gemspec path: "../"
2 changes: 1 addition & 1 deletion lib/rolify/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Rolify
VERSION = "5.1.0"
VERSION = "5.2.0"
end

0 comments on commit 154748c

Please sign in to comment.