Skip to content

Commit 154748c

Browse files
mikwatwldcordeiro
mikwat
authored and
wldcordeiro
committed
Prepare version 5.2.0 (RolifyCommunity#478)
* Prepare version 5.2.0 * Upgrade database_cleaner for ruby 2.3 compatibility.
1 parent bf6b9a1 commit 154748c

11 files changed

+60
-41
lines changed

‎CHANGELOG.rdoc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
= 5.2.0 (Dec 14, 2017)
2+
* Fix regression in generator around belongs_to options compatibility
3+
* Update version of database_cleaner
4+
* Update initializer.rb to include the remove_role_if_empty option and description
5+
* Allow inverse_of option on rolify method
6+
* Fix the code-climate-reporter issue that's causing travis to fail
7+
* Remove a separate index for the name column
8+
* Fix migration generator for AR 5.x
9+
* Fixed ambiguous column error
10+
111
= 5.1.0 (Mar 19, 2016)
212
* Rails 5 Support (thanks @lorefnon)
313
* Fix user handling in generator (thanks @lorefnon)

‎CONTRIBUTORS

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,12 @@ Mauro George (@MauroGeorge)
66
Cheri Allen(@cherimarie)
77
Gaurab Paul (@lorefnon)
88
Dmitry Krakosevich (@DmitryKK)
9+
Michael Watts (@mikwat)
10+
Derek Ethier (@ethier)
11+
Michael (@mibamur)
12+
Undo1 (@Undo1)
13+
Hitabis Engineering (@Hitabis)
14+
Sergey Alekseev (@sergey-alekseev)
15+
Sankalp Kulshreshtha (@sankalpk)
16+
Kirill Sevastyanenko (@kirillseva)
17+
Denis Shevchenko (@SimplySorc)

‎Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ group :test do
77
gem 'byebug'
88
gem 'pry-byebug'
99
gem 'test-unit' # Implicitly loaded by ammeter
10-
gem 'database_cleaner', '~> 1.5.3'
10+
gem 'database_cleaner', '~> 1.6.2'
1111
gem 'codeclimate-test-reporter', :require => nil
1212
end
1313

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2016 Florent Monbillard
1+
Copyright (c) 2017 Florent Monbillard
22

33
Permission is hereby granted, free of charge, to any person obtaining
44
a copy of this software and associated documentation files (the

‎gemfiles/activerecord_3.gemfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
source "https://rubygems.org"
44

5-
gem "sqlite3", :platform => "ruby"
6-
gem "activerecord", "~> 3.2.0", :require => "active_record"
5+
gem "sqlite3", platform: "ruby"
6+
gem "activerecord", "~> 3.2.0", require: "active_record"
77

88
group :test do
99
gem "appraisal"
10-
gem "coveralls", :require => false
10+
gem "coveralls", require: false
1111
gem "its"
1212
gem "byebug"
1313
gem "pry-byebug"
1414
gem "test-unit"
15-
gem "database_cleaner", "~> 1.5.3"
16-
gem "codeclimate-test-reporter", :require => nil
15+
gem "database_cleaner", "~> 1.6.2"
16+
gem "codeclimate-test-reporter", require: nil
1717
end
1818

19-
gemspec :path => "../"
19+
gemspec path: "../"

‎gemfiles/activerecord_4.gemfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
source "https://rubygems.org"
44

5-
gem "sqlite3", :platform => "ruby"
6-
gem "activerecord", "~> 4.2.5", :require => "active_record"
5+
gem "sqlite3", platform: "ruby"
6+
gem "activerecord", "~> 4.2.5", require: "active_record"
77

88
group :test do
99
gem "appraisal"
10-
gem "coveralls", :require => false
10+
gem "coveralls", require: false
1111
gem "its"
1212
gem "byebug"
1313
gem "pry-byebug"
1414
gem "test-unit"
15-
gem "database_cleaner", "~> 1.5.3"
16-
gem "codeclimate-test-reporter", :require => nil
15+
gem "database_cleaner", "~> 1.6.2"
16+
gem "codeclimate-test-reporter", require: nil
1717
end
1818

19-
gemspec :path => "../"
19+
gemspec path: "../"

‎gemfiles/activerecord_5.gemfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@
22

33
source "https://rubygems.org"
44

5-
gem "sqlite3", :platform => "ruby"
6-
gem "activerecord", ">= 5.0.0.beta", :require => "active_record"
5+
gem "sqlite3", platform: "ruby"
6+
gem "activerecord", ">= 5.0.0.beta", require: "active_record"
77
gem "actionpack", ">= 5.0.0.beta2"
88
gem "activemodel", ">= 5.0.0.beta2"
99
gem "railties", ">= 5.0.0.beta2"
10-
gem "rspec-rails", :github => "rspec/rspec-rails"
11-
gem "rspec-core", :github => "rspec/rspec-core"
12-
gem "rspec-expectations", :github => "rspec/rspec-expectations"
13-
gem "rspec-mocks", :github => "rspec/rspec-mocks"
14-
gem "rspec-support", :github => "rspec/rspec-support"
10+
gem "rspec-rails", github: "rspec/rspec-rails"
11+
gem "rspec-core", github: "rspec/rspec-core"
12+
gem "rspec-expectations", github: "rspec/rspec-expectations"
13+
gem "rspec-mocks", github: "rspec/rspec-mocks"
14+
gem "rspec-support", github: "rspec/rspec-support"
1515

1616
group :test do
1717
gem "appraisal"
18-
gem "coveralls", :require => false
18+
gem "coveralls", require: false
1919
gem "its"
2020
gem "byebug"
2121
gem "pry-byebug"
2222
gem "test-unit"
23-
gem "database_cleaner", "~> 1.5.3"
24-
gem "codeclimate-test-reporter", :require => nil
23+
gem "database_cleaner", "~> 1.6.2"
24+
gem "codeclimate-test-reporter", require: nil
2525
end
2626

27-
gemspec :path => "../"
27+
gemspec path: "../"

‎gemfiles/mongoid_3.gemfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
source "https://rubygems.org"
44

55
gem "mongoid", "~> 3"
6-
gem "bson_ext", :platform => "ruby"
6+
gem "bson_ext", platform: "ruby"
77

88
group :test do
99
gem "appraisal"
10-
gem "coveralls", :require => false
10+
gem "coveralls", require: false
1111
gem "its"
1212
gem "byebug"
1313
gem "pry-byebug"
1414
gem "test-unit"
15-
gem "database_cleaner", "~> 1.5.3"
16-
gem "codeclimate-test-reporter", :require => nil
15+
gem "database_cleaner", "~> 1.6.2"
16+
gem "codeclimate-test-reporter", require: nil
1717
end
1818

19-
gemspec :path => "../"
19+
gemspec path: "../"

‎gemfiles/mongoid_4.gemfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
source "https://rubygems.org"
44

55
gem "mongoid", "~> 4"
6-
gem "bson_ext", :platform => "ruby"
6+
gem "bson_ext", platform: "ruby"
77

88
group :test do
99
gem "appraisal"
10-
gem "coveralls", :require => false
10+
gem "coveralls", require: false
1111
gem "its"
1212
gem "byebug"
1313
gem "pry-byebug"
1414
gem "test-unit"
15-
gem "database_cleaner", "~> 1.5.3"
16-
gem "codeclimate-test-reporter", :require => nil
15+
gem "database_cleaner", "~> 1.6.2"
16+
gem "codeclimate-test-reporter", require: nil
1717
end
1818

19-
gemspec :path => "../"
19+
gemspec path: "../"

‎gemfiles/mongoid_5.gemfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
source "https://rubygems.org"
44

55
gem "mongoid", "~> 5"
6-
gem "bson_ext", :platform => "ruby"
6+
gem "bson_ext", platform: "ruby"
77

88
group :test do
99
gem "appraisal"
10-
gem "coveralls", :require => false
10+
gem "coveralls", require: false
1111
gem "its"
1212
gem "byebug"
1313
gem "pry-byebug"
1414
gem "test-unit"
15-
gem "database_cleaner", "~> 1.5.3"
16-
gem "codeclimate-test-reporter", :require => nil
15+
gem "database_cleaner", "~> 1.6.2"
16+
gem "codeclimate-test-reporter", require: nil
1717
end
1818

19-
gemspec :path => "../"
19+
gemspec path: "../"

‎lib/rolify/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module Rolify
2-
VERSION = "5.1.0"
2+
VERSION = "5.2.0"
33
end

0 commit comments

Comments
 (0)