Skip to content

Commit 674438b

Browse files
johnnyshieldsjohnnyshields
committed
Merge remote-tracking branch 'remotes/origin/main' into 4.8.0-mixins
2 parents ac332c6 + 451ff6d commit 674438b

25 files changed

Lines changed: 344 additions & 203 deletions

‎.github/workflows/test.yml‎

Lines changed: 113 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -7,87 +7,130 @@ jobs:
77
matrix:
88
gemfile:
99
- Gemfile
10+
- gemfiles/Gemfile-rails-main
11+
- gemfiles/Gemfile-rails-6-1
1012
- gemfiles/Gemfile-rails-6-0
1113
- gemfiles/Gemfile-rails-5-2
1214
- gemfiles/Gemfile-rails-5-1
1315
- gemfiles/Gemfile-rails-5-0
1416
- gemfiles/Gemfile-rails-4-2
1517
- gemfiles/Gemfile-rails-4-1
1618
ruby:
17-
- 2.1
18-
- 2.2
19-
- 2.3
20-
- 2.4
21-
- 2.5
22-
- 2.6
23-
- 2.7
24-
- 3.0
19+
- '3.1'
20+
- '3.0'
21+
- '2.7'
22+
- '2.6'
23+
- '2.5'
24+
- '2.4'
25+
- '2.3'
26+
- '2.2'
27+
- '2.1'
2528
env:
2629
- DEVISE_ORM=active_record
2730
- DEVISE_ORM=mongoid
2831
exclude:
29-
- ruby: 2.1
30-
gemfile: Gemfile
31-
- ruby: 2.1
32-
gemfile: gemfiles/Gemfile-rails-6-0
33-
- ruby: 2.1
34-
gemfile: gemfiles/Gemfile-rails-5-2
35-
- ruby: 2.1
36-
gemfile: gemfiles/Gemfile-rails-5-1
37-
- ruby: 2.1
38-
gemfile: gemfiles/Gemfile-rails-5-0
39-
- ruby: 2.2
40-
gemfile: Gemfile
41-
- ruby: 2.2
42-
gemfile: gemfiles/Gemfile-rails-6-0
43-
- ruby: 2.2
44-
gemfile: gemfiles/Gemfile-rails-5-2
45-
- ruby: 2.3
46-
gemfile: Gemfile
47-
- ruby: 2.3
48-
gemfile: gemfiles/Gemfile-rails-6-0
49-
- ruby: 2.4
50-
gemfile: Gemfile
51-
- ruby: 2.4
52-
gemfile: gemfiles/Gemfile-rails-6-0
53-
- ruby: 2.4
54-
gemfile: gemfiles/Gemfile-rails-4-1
55-
- ruby: 2.5
56-
gemfile: gemfiles/Gemfile-rails-4-1
57-
- ruby: 2.6
58-
gemfile: gemfiles/Gemfile-rails-4-1
59-
- ruby: 2.6
60-
gemfile: gemfiles/Gemfile-rails-4-2
61-
- ruby: 2.7
62-
gemfile: gemfiles/Gemfile-rails-4-1
63-
- ruby: 2.7
64-
gemfile: gemfiles/Gemfile-rails-4-2
65-
- ruby: 2.7
66-
gemfile: gemfiles/Gemfile-rails-5-0
67-
- ruby: 2.7
68-
gemfile: gemfiles/Gemfile-rails-5-1
69-
- ruby: 2.7
70-
gemfile: gemfiles/Gemfile-rails-5-2
71-
- ruby: 3.0
72-
gemfile: gemfiles/Gemfile-rails-4-1
73-
- ruby: 3.0
74-
gemfile: gemfiles/Gemfile-rails-4-2
75-
- ruby: 3.0
76-
gemfile: gemfiles/Gemfile-rails-5-0
77-
- ruby: 3.0
78-
gemfile: gemfiles/Gemfile-rails-5-1
79-
- ruby: 3.0
80-
gemfile: gemfiles/Gemfile-rails-5-2
81-
- env: DEVISE_ORM=mongoid
82-
gemfile: Gemfile
83-
- env: DEVISE_ORM=mongoid
84-
gemfile: gemfiles/Gemfile-rails-5-0
85-
- env: DEVISE_ORM=mongoid
86-
gemfile: gemfiles/Gemfile-rails-5-1
87-
- env: DEVISE_ORM=mongoid
88-
gemfile: gemfiles/Gemfile-rails-5-2
89-
- env: DEVISE_ORM=mongoid
90-
gemfile: gemfiles/Gemfile-rails-6-0
32+
- gemfile: Gemfile
33+
ruby: '2.6'
34+
- gemfile: Gemfile
35+
ruby: '2.5'
36+
- gemfile: Gemfile
37+
ruby: '2.4'
38+
- gemfile: Gemfile
39+
ruby: '2.3'
40+
- gemfile: Gemfile
41+
ruby: '2.2'
42+
- gemfile: Gemfile
43+
ruby: '2.1'
44+
- gemfile: Gemfile
45+
env: DEVISE_ORM=mongoid
46+
- gemfile: gemfiles/Gemfile-rails-main
47+
ruby: '2.6'
48+
- gemfile: gemfiles/Gemfile-rails-main
49+
ruby: '2.5'
50+
- gemfile: gemfiles/Gemfile-rails-main
51+
ruby: '2.4'
52+
- gemfile: gemfiles/Gemfile-rails-main
53+
ruby: '2.3'
54+
- gemfile: gemfiles/Gemfile-rails-main
55+
ruby: '2.2'
56+
- gemfile: gemfiles/Gemfile-rails-main
57+
ruby: '2.1'
58+
- gemfile: gemfiles/Gemfile-rails-main
59+
env: DEVISE_ORM=mongoid
60+
- gemfile: gemfiles/Gemfile-rails-6-1
61+
ruby: '2.4'
62+
- gemfile: gemfiles/Gemfile-rails-6-1
63+
ruby: '2.3'
64+
- gemfile: gemfiles/Gemfile-rails-6-1
65+
ruby: '2.2'
66+
- gemfile: gemfiles/Gemfile-rails-6-1
67+
ruby: '2.1'
68+
- gemfile: gemfiles/Gemfile-rails-6-1
69+
env: DEVISE_ORM=mongoid
70+
- gemfile: gemfiles/Gemfile-rails-6-0
71+
ruby: '3.1'
72+
- gemfile: gemfiles/Gemfile-rails-6-0
73+
ruby: '2.4'
74+
- gemfile: gemfiles/Gemfile-rails-6-0
75+
ruby: '2.3'
76+
- gemfile: gemfiles/Gemfile-rails-6-0
77+
ruby: '2.2'
78+
- gemfile: gemfiles/Gemfile-rails-6-0
79+
ruby: '2.1'
80+
- gemfile: gemfiles/Gemfile-rails-6-0
81+
env: DEVISE_ORM=mongoid
82+
- gemfile: gemfiles/Gemfile-rails-5-2
83+
ruby: '3.1'
84+
- gemfile: gemfiles/Gemfile-rails-5-2
85+
ruby: '3.0'
86+
- gemfile: gemfiles/Gemfile-rails-5-2
87+
ruby: '2.7'
88+
- gemfile: gemfiles/Gemfile-rails-5-2
89+
ruby: '2.2'
90+
- gemfile: gemfiles/Gemfile-rails-5-2
91+
ruby: '2.1'
92+
- gemfile: gemfiles/Gemfile-rails-5-2
93+
env: DEVISE_ORM=mongoid
94+
- gemfile: gemfiles/Gemfile-rails-5-1
95+
ruby: '3.1'
96+
- gemfile: gemfiles/Gemfile-rails-5-1
97+
ruby: '3.0'
98+
- gemfile: gemfiles/Gemfile-rails-5-1
99+
ruby: '2.7'
100+
- gemfile: gemfiles/Gemfile-rails-5-1
101+
ruby: '2.1'
102+
- gemfile: gemfiles/Gemfile-rails-5-1
103+
env: DEVISE_ORM=mongoid
104+
- gemfile: gemfiles/Gemfile-rails-5-0
105+
ruby: '3.1'
106+
- gemfile: gemfiles/Gemfile-rails-5-0
107+
ruby: '3.0'
108+
- gemfile: gemfiles/Gemfile-rails-5-0
109+
ruby: '2.7'
110+
- gemfile: gemfiles/Gemfile-rails-5-0
111+
ruby: '2.1'
112+
- gemfile: gemfiles/Gemfile-rails-5-0
113+
env: DEVISE_ORM=mongoid
114+
- gemfile: gemfiles/Gemfile-rails-4-2
115+
ruby: '3.1'
116+
- gemfile: gemfiles/Gemfile-rails-4-2
117+
ruby: '3.0'
118+
- gemfile: gemfiles/Gemfile-rails-4-2
119+
ruby: '2.7'
120+
- gemfile: gemfiles/Gemfile-rails-4-2
121+
ruby: '2.6'
122+
- gemfile: gemfiles/Gemfile-rails-4-1
123+
ruby: '3.1'
124+
- gemfile: gemfiles/Gemfile-rails-4-1
125+
ruby: '3.0'
126+
- gemfile: gemfiles/Gemfile-rails-4-1
127+
ruby: '2.7'
128+
- gemfile: gemfiles/Gemfile-rails-4-1
129+
ruby: '2.6'
130+
- gemfile: gemfiles/Gemfile-rails-4-1
131+
ruby: '2.5'
132+
- gemfile: gemfiles/Gemfile-rails-4-1
133+
ruby: '2.4'
91134
runs-on: ubuntu-latest
92135
env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
93136
BUNDLE_GEMFILE: ${{ matrix.gemfile }}

‎CHANGELOG.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
### unreleased
1+
### 4.8.1 - 2021-12-16
2+
3+
* enhancements
4+
* Add support for Rails 7.0. Please note that Turbo integration is not fully supported by Devise yet.
25

36
### 4.8.0 - 2021-04-29
47

‎Gemfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ source "https://rubygems.org"
44

55
gemspec
66

7-
gem "rails", "~> 6.1.0"
7+
gem "rails", "~> 7.0.0"
88
gem "omniauth"
99
gem "omniauth-oauth2"
1010
gem "rdoc"
@@ -14,6 +14,7 @@ gem "rails-controller-testing", github: "rails/rails-controller-testing"
1414
gem "responders", "~> 3.0"
1515

1616
group :test do
17+
gem "nokogiri", "< 1.13"
1718
gem "omniauth-facebook"
1819
gem "omniauth-openid"
1920
gem "rexml"

0 commit comments

Comments
 (0)