Skip to content

Commit 82b79ec

Browse files
Merge branch 'main' into ca-mongoid
2 parents d18d6d8 + 141ef37 commit 82b79ec

28 files changed

+375
-385
lines changed

.github/workflows/test.yml

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ jobs:
99
- Gemfile
1010
- gemfiles/Gemfile-rails-main
1111
- gemfiles/Gemfile-rails-7-0
12-
- gemfiles/Gemfile-rails-6-1
13-
- gemfiles/Gemfile-rails-6-0
12+
- gemfiles/Gemfile-rails-7-1
13+
- gemfiles/Gemfile-rails-7-2
14+
- gemfiles/Gemfile-rails-8-0
1415
ruby:
16+
- '3.4'
1517
- '3.3'
1618
- '3.2'
1719
- '3.1'
@@ -21,14 +23,28 @@ jobs:
2123
- DEVISE_ORM=active_record
2224
- DEVISE_ORM=mongoid
2325
exclude:
26+
- gemfile: Gemfile
27+
ruby: '3.1'
28+
- gemfile: Gemfile
29+
ruby: '3.0'
30+
- gemfile: Gemfile
31+
ruby: '2.7'
32+
- gemfile: gemfiles/Gemfile-rails-main
33+
ruby: '3.1'
2434
- gemfile: gemfiles/Gemfile-rails-main
25-
ruby: '2.7' # Rails > 7.1 supports Ruby >= 3.1
35+
ruby: '3.0'
2636
- gemfile: gemfiles/Gemfile-rails-main
27-
ruby: '3.0' # Rails > 7.1 supports Ruby >= 3.1
28-
- gemfile: gemfiles/Gemfile-rails-6-0
29-
ruby: '3.2'
30-
- gemfile: gemfiles/Gemfile-rails-6-0
37+
ruby: '2.7'
38+
- gemfile: gemfiles/Gemfile-rails-8-0
3139
ruby: '3.1'
40+
- gemfile: gemfiles/Gemfile-rails-8-0
41+
ruby: '3.0'
42+
- gemfile: gemfiles/Gemfile-rails-8-0
43+
ruby: '2.7'
44+
- gemfile: gemfiles/Gemfile-rails-7-2
45+
ruby: '3.0'
46+
- gemfile: gemfiles/Gemfile-rails-7-2
47+
ruby: '2.7'
3248
runs-on: ubuntu-latest
3349
env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
3450
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
@@ -38,6 +54,6 @@ jobs:
3854
with:
3955
ruby-version: ${{ matrix.ruby }}
4056
bundler-cache: true # runs bundle install and caches installed gems automatically
41-
- uses: supercharge/mongodb-github-action@1.10.0
57+
- uses: supercharge/mongodb-github-action@1.11.0
4258
if: ${{ matrix.env == 'DEVISE_ORM=mongoid' }}
4359
- run: bundle exec rake

CHANGELOG.md

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

33
* breaking changes
44
* Drop support to Ruby < 2.7
5-
* Drop support to Rails < 6.0
5+
* Drop support to Rails < 7.0
6+
* Remove `SecretKeyFinder` and use `app.secret_key_base` as the default secret key for `Devise.secret_key` if a custom `Devise.secret_key` is not provided.
7+
8+
This is potentially a breaking change because Devise previously used the following order to find a secret key:
9+
10+
```
11+
app.credentials.secret_key_base > app.secrets.secret_key_base > application.config.secret_key_base > application.secret_key_base
12+
```
13+
14+
Now, it always uses `application.secret_key_base`. Make sure you're using the same secret key after the upgrade; otherwise, previously generated tokens for `recoverable`, `lockable`, and `confirmable` will be invalid.
15+
https://github.com/heartcombo/devise/pull/5645
616
717
* enhancements
818
* Removed deprecations warning output for `Devise::Models::Authenticatable::BLACKLIST_FOR_SERIALIZATION` (@soartec-lab)
9-
* Reenable Mongoid test suite across all Rails 6+ versions, to ensure we continue supporting it. Changes to dirty tracking to support Mongoid 8.0+. [#5568](https://github.com/heartcombo/devise/pull/5568)
19+
* Add Rails 8 support.
20+
- Routes are lazy-loaded by default in test and development environments now so Devise loads them before `Devise.mappings` call.
21+
* Add Ruby 3.4 support.
22+
* Password length validator is changed from
23+
24+
```
25+
validates_length_of :password, within: password_length, allow_blank: true`
26+
```
27+
28+
to
29+
30+
```
31+
validates_length_of :password, minimum: proc { password_length.min }, maximum: proc { password_length.max }, allow_blank: true
32+
```
33+
34+
so it's possible to override `password_length` at runtime. (@manojmj92)
35+
* Reenable Mongoid test suite across all Rails 7+ versions, to ensure we continue supporting it. Changes to dirty tracking to support Mongoid 8.0+. [#5568](https://github.com/heartcombo/devise/pull/5568)
36+
* bug fixes
37+
* Make `Devise` work without `ActionMailer` when `Zeitwerk` autoloader is used.
1038
1139
Please check [4-stable](https://github.com/heartcombo/devise/blob/4-stable/CHANGELOG.md)
1240
for previous changes.

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ Project maintainers have the right and responsibility to remove, edit, or reject
1717

1818
This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
1919

20-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by sending an email to [heartcombo@googlegroups.com](heartcombo@googlegroups.com) or contacting one or more of the project maintainers.
20+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by sending an email to [heartcombo.oss@gmail.com](heartcombo.oss@gmail.com) or contacting one or more of the project maintainers.
2121

2222
This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ the project wiki, documentation and source code first, or try to ask your questi
3030
on [Stack Overflow](http://stackoverflow.com/questions/tagged/devise).
3131

3232
**If you find a security bug, do not report it through GitHub. Please send an
33-
e-mail to [heartcombo@googlegroups.com](mailto:heartcombo@googlegroups.com)
33+
e-mail to [heartcombo.oss@gmail.com](mailto:heartcombo.oss@gmail.com)
3434
instead.**
3535

3636
## Sending Pull Requests

Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,28 @@ source "https://rubygems.org"
44

55
gemspec
66

7-
gem "rails", "~> 7.1.0"
87
gem "omniauth"
98
gem "omniauth-oauth2"
9+
gem "rails", "~> 8.1.0.rc1"
1010
gem "rdoc"
1111

1212
gem "rails-controller-testing", github: "rails/rails-controller-testing"
1313

1414
gem "responders", "~> 3.1"
1515

1616
group :test do
17+
gem "mocha", "~> 2.1", require: false
1718
gem "omniauth-facebook"
1819
gem "omniauth-openid"
1920
gem "rexml"
2021
gem "timecop"
21-
gem "webrat", "0.7.3", require: false
22-
gem "mocha", "~> 2.1", require: false
22+
gem "webrat"
2323
end
2424

2525
platforms :ruby do
2626
gem "sqlite3"
2727
end
2828

2929
group :mongoid do
30-
gem "mongoid", "~> 8.1"
30+
gem "mongoid", "~> 9.0"
3131
end

0 commit comments

Comments
 (0)