From 154748cb80af891e9812899b382cb9d7fb631eec Mon Sep 17 00:00:00 2001 From: Michael Watts Date: Tue, 19 Dec 2017 11:09:38 -0800 Subject: [PATCH] Prepare version 5.2.0 (#478) * Prepare version 5.2.0 * Upgrade database_cleaner for ruby 2.3 compatibility. --- CHANGELOG.rdoc | 10 ++++++++++ CONTRIBUTORS | 9 +++++++++ Gemfile | 2 +- LICENSE | 2 +- gemfiles/activerecord_3.gemfile | 12 ++++++------ gemfiles/activerecord_4.gemfile | 12 ++++++------ gemfiles/activerecord_5.gemfile | 22 +++++++++++----------- gemfiles/mongoid_3.gemfile | 10 +++++----- gemfiles/mongoid_4.gemfile | 10 +++++----- gemfiles/mongoid_5.gemfile | 10 +++++----- lib/rolify/version.rb | 2 +- 11 files changed, 60 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc index 012dde84..22708e74 100644 --- a/CHANGELOG.rdoc +++ b/CHANGELOG.rdoc @@ -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) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index d9f200da..2adb9960 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -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) diff --git a/Gemfile b/Gemfile index b7253f27..402f2f6c 100644 --- a/Gemfile +++ b/Gemfile @@ -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 diff --git a/LICENSE b/LICENSE index de1e4762..e3308912 100644 --- a/LICENSE +++ b/LICENSE @@ -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 diff --git a/gemfiles/activerecord_3.gemfile b/gemfiles/activerecord_3.gemfile index 2e91e7f6..33d4af98 100644 --- a/gemfiles/activerecord_3.gemfile +++ b/gemfiles/activerecord_3.gemfile @@ -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: "../" diff --git a/gemfiles/activerecord_4.gemfile b/gemfiles/activerecord_4.gemfile index b0729eca..8624e972 100644 --- a/gemfiles/activerecord_4.gemfile +++ b/gemfiles/activerecord_4.gemfile @@ -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: "../" diff --git a/gemfiles/activerecord_5.gemfile b/gemfiles/activerecord_5.gemfile index 330eb321..9b9ced81 100644 --- a/gemfiles/activerecord_5.gemfile +++ b/gemfiles/activerecord_5.gemfile @@ -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: "../" diff --git a/gemfiles/mongoid_3.gemfile b/gemfiles/mongoid_3.gemfile index 358d4f60..d405e8b7 100644 --- a/gemfiles/mongoid_3.gemfile +++ b/gemfiles/mongoid_3.gemfile @@ -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: "../" diff --git a/gemfiles/mongoid_4.gemfile b/gemfiles/mongoid_4.gemfile index 0333fcee..f3706439 100644 --- a/gemfiles/mongoid_4.gemfile +++ b/gemfiles/mongoid_4.gemfile @@ -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: "../" diff --git a/gemfiles/mongoid_5.gemfile b/gemfiles/mongoid_5.gemfile index 0ff3a7ab..d70b24f2 100644 --- a/gemfiles/mongoid_5.gemfile +++ b/gemfiles/mongoid_5.gemfile @@ -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: "../" diff --git a/lib/rolify/version.rb b/lib/rolify/version.rb index a44ff09d..2d4d8235 100644 --- a/lib/rolify/version.rb +++ b/lib/rolify/version.rb @@ -1,3 +1,3 @@ module Rolify - VERSION = "5.1.0" + VERSION = "5.2.0" end