Skip to content

Commit baab7bc

Browse files
deivid-rodriguezdeivid-rodriguez
committed
Pickup fixes for devise deprecations on Rails 6.1
1 parent 0c69172 commit baab7bc

File tree

10 files changed

+70
-40
lines changed

10 files changed

+70
-40
lines changed

‎Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ group :development, :test do
1010
gem "jruby-openssl", "~> 0.10.5", platform: :jruby
1111

1212
gem "draper", "~> 4.0"
13-
gem "devise"
13+
gem "devise", github: "heartcombo/devise", ref: "0cd72a56f984a7ff089246f87a8b259120545edd"
1414

1515
gem "rails", "~> 6.1.0"
1616
gem "activerecord-jdbcsqlite3-adapter", "~> 61.a", github: "jruby/activerecord-jdbc-adapter", platform: :jruby

‎Gemfile.lock

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
GIT
2+
remote: https://github.com/heartcombo/devise.git
3+
revision: 0cd72a56f984a7ff089246f87a8b259120545edd
4+
ref: 0cd72a56f984a7ff089246f87a8b259120545edd
5+
specs:
6+
devise (4.7.3)
7+
bcrypt (~> 3.0)
8+
orm_adapter (~> 0.1)
9+
railties (>= 4.1.0)
10+
responders
11+
warden (~> 1.2.3)
12+
113
GIT
214
remote: https://github.com/jruby/activerecord-jdbc-adapter.git
315
revision: 93267a35ebd8d3882fc4c7b1f118c12d9e74f01b
@@ -164,12 +176,6 @@ GEM
164176
db-query-matchers (0.10.0)
165177
activesupport (>= 4.0, < 7)
166178
rspec (~> 3.0)
167-
devise (4.7.3)
168-
bcrypt (~> 3.0)
169-
orm_adapter (~> 0.1)
170-
railties (>= 4.1.0)
171-
responders
172-
warden (~> 1.2.3)
173179
diff-lcs (1.4.4)
174180
docile (1.3.4)
175181
draper (4.0.1)
@@ -473,7 +479,7 @@ DEPENDENCIES
473479
cuprite (= 0.13)
474480
database_cleaner
475481
db-query-matchers (= 0.10.0)
476-
devise
482+
devise!
477483
draper (~> 4.0)
478484
formtastic (~> 4.0.rc1)
479485
i18n-spec

‎gemfiles/rails_52/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ group :development, :test do
1010
gem "jruby-openssl", "~> 0.10.5", platform: :jruby
1111

1212
gem "draper", "~> 4.0"
13-
gem "devise"
13+
gem "devise", github: "heartcombo/devise", ref: "0cd72a56f984a7ff089246f87a8b259120545edd"
1414

1515
gem "rails", "~> 5.2.3"
1616
gem "activerecord-jdbcsqlite3-adapter", "~> 52.0", platform: :jruby

‎gemfiles/rails_52/Gemfile.lock

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
GIT
2+
remote: https://github.com/heartcombo/devise.git
3+
revision: 0cd72a56f984a7ff089246f87a8b259120545edd
4+
ref: 0cd72a56f984a7ff089246f87a8b259120545edd
5+
specs:
6+
devise (4.7.3)
7+
bcrypt (~> 3.0)
8+
orm_adapter (~> 0.1)
9+
railties (>= 4.1.0)
10+
responders
11+
warden (~> 1.2.3)
12+
113
PATH
214
remote: ../..
315
specs:
@@ -136,12 +148,6 @@ GEM
136148
db-query-matchers (0.10.0)
137149
activesupport (>= 4.0, < 7)
138150
rspec (~> 3.0)
139-
devise (4.7.3)
140-
bcrypt (~> 3.0)
141-
orm_adapter (~> 0.1)
142-
railties (>= 4.1.0)
143-
responders
144-
warden (~> 1.2.3)
145151
diff-lcs (1.4.4)
146152
docile (1.3.4)
147153
draper (4.0.1)
@@ -371,7 +377,7 @@ DEPENDENCIES
371377
cuprite (= 0.13)
372378
database_cleaner
373379
db-query-matchers (= 0.10.0)
374-
devise
380+
devise!
375381
draper (~> 4.0)
376382
formtastic (~> 4.0.rc1)
377383
jasmine

‎gemfiles/rails_60/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ group :development, :test do
1010
gem "jruby-openssl", "~> 0.10.5", platform: :jruby
1111

1212
gem "draper", "~> 4.0"
13-
gem "devise"
13+
gem "devise", github: "heartcombo/devise", ref: "0cd72a56f984a7ff089246f87a8b259120545edd"
1414

1515
gem "rails", "~> 6.0.0"
1616
gem "activerecord-jdbcsqlite3-adapter", "~> 60.0", platform: :jruby

‎gemfiles/rails_60/Gemfile.lock

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
GIT
2+
remote: https://github.com/heartcombo/devise.git
3+
revision: 0cd72a56f984a7ff089246f87a8b259120545edd
4+
ref: 0cd72a56f984a7ff089246f87a8b259120545edd
5+
specs:
6+
devise (4.7.3)
7+
bcrypt (~> 3.0)
8+
orm_adapter (~> 0.1)
9+
railties (>= 4.1.0)
10+
responders
11+
warden (~> 1.2.3)
12+
113
PATH
214
remote: ../..
315
specs:
@@ -149,12 +161,6 @@ GEM
149161
db-query-matchers (0.10.0)
150162
activesupport (>= 4.0, < 7)
151163
rspec (~> 3.0)
152-
devise (4.7.3)
153-
bcrypt (~> 3.0)
154-
orm_adapter (~> 0.1)
155-
railties (>= 4.1.0)
156-
responders
157-
warden (~> 1.2.3)
158164
diff-lcs (1.4.4)
159165
docile (1.3.4)
160166
draper (4.0.1)
@@ -387,7 +393,7 @@ DEPENDENCIES
387393
cuprite (= 0.13)
388394
database_cleaner
389395
db-query-matchers (= 0.10.0)
390-
devise
396+
devise!
391397
draper (~> 4.0)
392398
formtastic (~> 4.0.rc1)
393399
jasmine

‎gemfiles/rails_61_turbolinks/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ group :development, :test do
1010
gem "jruby-openssl", "~> 0.10.5", platform: :jruby
1111

1212
gem "draper", "~> 4.0"
13-
gem "devise"
13+
gem "devise", github: "heartcombo/devise", ref: "0cd72a56f984a7ff089246f87a8b259120545edd"
1414

1515
gem "rails", "~> 6.1.0"
1616
gem "activerecord-jdbcsqlite3-adapter", "~> 61.a", github: "jruby/activerecord-jdbc-adapter", platform: :jruby

‎gemfiles/rails_61_turbolinks/Gemfile.lock

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
GIT
2+
remote: https://github.com/heartcombo/devise.git
3+
revision: 0cd72a56f984a7ff089246f87a8b259120545edd
4+
ref: 0cd72a56f984a7ff089246f87a8b259120545edd
5+
specs:
6+
devise (4.7.3)
7+
bcrypt (~> 3.0)
8+
orm_adapter (~> 0.1)
9+
railties (>= 4.1.0)
10+
responders
11+
warden (~> 1.2.3)
12+
113
GIT
214
remote: https://github.com/jruby/activerecord-jdbc-adapter.git
315
revision: 93267a35ebd8d3882fc4c7b1f118c12d9e74f01b
@@ -159,12 +171,6 @@ GEM
159171
db-query-matchers (0.10.0)
160172
activesupport (>= 4.0, < 7)
161173
rspec (~> 3.0)
162-
devise (4.7.3)
163-
bcrypt (~> 3.0)
164-
orm_adapter (~> 0.1)
165-
railties (>= 4.1.0)
166-
responders
167-
warden (~> 1.2.3)
168174
diff-lcs (1.4.4)
169175
docile (1.3.4)
170176
draper (4.0.1)
@@ -399,7 +405,7 @@ DEPENDENCIES
399405
cuprite (= 0.13)
400406
database_cleaner
401407
db-query-matchers (= 0.10.0)
402-
devise
408+
devise!
403409
draper (~> 4.0)
404410
formtastic (~> 4.0.rc1)
405411
jasmine

‎gemfiles/rails_61_webpacker/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ group :development, :test do
1010
gem "jruby-openssl", "~> 0.10.5", platform: :jruby
1111

1212
gem "draper", "~> 4.0"
13-
gem "devise"
13+
gem "devise", github: "heartcombo/devise", ref: "0cd72a56f984a7ff089246f87a8b259120545edd"
1414

1515
gem "rails", "~> 6.1.0"
1616
gem "activerecord-jdbcsqlite3-adapter", "~> 61.a", github: "jruby/activerecord-jdbc-adapter", platform: :jruby

‎gemfiles/rails_61_webpacker/Gemfile.lock

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
GIT
2+
remote: https://github.com/heartcombo/devise.git
3+
revision: 0cd72a56f984a7ff089246f87a8b259120545edd
4+
ref: 0cd72a56f984a7ff089246f87a8b259120545edd
5+
specs:
6+
devise (4.7.3)
7+
bcrypt (~> 3.0)
8+
orm_adapter (~> 0.1)
9+
railties (>= 4.1.0)
10+
responders
11+
warden (~> 1.2.3)
12+
113
GIT
214
remote: https://github.com/jruby/activerecord-jdbc-adapter.git
315
revision: 93267a35ebd8d3882fc4c7b1f118c12d9e74f01b
@@ -159,12 +171,6 @@ GEM
159171
db-query-matchers (0.10.0)
160172
activesupport (>= 4.0, < 7)
161173
rspec (~> 3.0)
162-
devise (4.7.3)
163-
bcrypt (~> 3.0)
164-
orm_adapter (~> 0.1)
165-
railties (>= 4.1.0)
166-
responders
167-
warden (~> 1.2.3)
168174
diff-lcs (1.4.4)
169175
docile (1.3.4)
170176
draper (4.0.1)
@@ -395,7 +401,7 @@ DEPENDENCIES
395401
cuprite (= 0.13)
396402
database_cleaner
397403
db-query-matchers (= 0.10.0)
398-
devise
404+
devise!
399405
draper (~> 4.0)
400406
formtastic (~> 4.0.rc1)
401407
jasmine

0 commit comments

Comments
 (0)