Skip to content

Commit 72fc358

Browse files
authored
Merge pull request #1494 from fatfreecrm/rails71
Update to Rails 7.1
2 parents 0619bf8 + 857be7a commit 72fc358

File tree

12 files changed

+125
-85
lines changed

12 files changed

+125
-85
lines changed

Gemfile.lock

Lines changed: 114 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ GIT
88

99
GIT
1010
remote: https://github.com/fatfreecrm/acts_as_commentable.git
11-
revision: 55516496eefa1c7d109249730b4527e3af236423
11+
revision: 28df5959f8c17168be7c5d4ed3ea2f3d06275773
1212
branch: main
1313
specs:
14-
acts_as_commentable (6.1.0)
15-
activerecord (>= 6.1, < 7.1)
14+
acts_as_commentable (7.1.0)
15+
activerecord (~> 7.1.0)
1616

1717
GIT
1818
remote: https://github.com/jquery-ui-rails/jquery-ui-rails.git
@@ -25,74 +25,86 @@ GIT
2525
GEM
2626
remote: https://rubygems.org/
2727
specs:
28-
actioncable (7.0.8.7)
29-
actionpack (= 7.0.8.7)
30-
activesupport (= 7.0.8.7)
28+
actioncable (7.1.5.1)
29+
actionpack (= 7.1.5.1)
30+
activesupport (= 7.1.5.1)
3131
nio4r (~> 2.0)
3232
websocket-driver (>= 0.6.1)
33-
actionmailbox (7.0.8.7)
34-
actionpack (= 7.0.8.7)
35-
activejob (= 7.0.8.7)
36-
activerecord (= 7.0.8.7)
37-
activestorage (= 7.0.8.7)
38-
activesupport (= 7.0.8.7)
33+
zeitwerk (~> 2.6)
34+
actionmailbox (7.1.5.1)
35+
actionpack (= 7.1.5.1)
36+
activejob (= 7.1.5.1)
37+
activerecord (= 7.1.5.1)
38+
activestorage (= 7.1.5.1)
39+
activesupport (= 7.1.5.1)
3940
mail (>= 2.7.1)
4041
net-imap
4142
net-pop
4243
net-smtp
43-
actionmailer (7.0.8.7)
44-
actionpack (= 7.0.8.7)
45-
actionview (= 7.0.8.7)
46-
activejob (= 7.0.8.7)
47-
activesupport (= 7.0.8.7)
44+
actionmailer (7.1.5.1)
45+
actionpack (= 7.1.5.1)
46+
actionview (= 7.1.5.1)
47+
activejob (= 7.1.5.1)
48+
activesupport (= 7.1.5.1)
4849
mail (~> 2.5, >= 2.5.4)
4950
net-imap
5051
net-pop
5152
net-smtp
52-
rails-dom-testing (~> 2.0)
53-
actionpack (7.0.8.7)
54-
actionview (= 7.0.8.7)
55-
activesupport (= 7.0.8.7)
56-
rack (~> 2.0, >= 2.2.4)
53+
rails-dom-testing (~> 2.2)
54+
actionpack (7.1.5.1)
55+
actionview (= 7.1.5.1)
56+
activesupport (= 7.1.5.1)
57+
nokogiri (>= 1.8.5)
58+
racc
59+
rack (>= 2.2.4)
60+
rack-session (>= 1.0.1)
5761
rack-test (>= 0.6.3)
58-
rails-dom-testing (~> 2.0)
59-
rails-html-sanitizer (~> 1.0, >= 1.2.0)
60-
actiontext (7.0.8.7)
61-
actionpack (= 7.0.8.7)
62-
activerecord (= 7.0.8.7)
63-
activestorage (= 7.0.8.7)
64-
activesupport (= 7.0.8.7)
62+
rails-dom-testing (~> 2.2)
63+
rails-html-sanitizer (~> 1.6)
64+
actiontext (7.1.5.1)
65+
actionpack (= 7.1.5.1)
66+
activerecord (= 7.1.5.1)
67+
activestorage (= 7.1.5.1)
68+
activesupport (= 7.1.5.1)
6569
globalid (>= 0.6.0)
6670
nokogiri (>= 1.8.5)
67-
actionview (7.0.8.7)
68-
activesupport (= 7.0.8.7)
71+
actionview (7.1.5.1)
72+
activesupport (= 7.1.5.1)
6973
builder (~> 3.1)
70-
erubi (~> 1.4)
71-
rails-dom-testing (~> 2.0)
72-
rails-html-sanitizer (~> 1.1, >= 1.2.0)
73-
activejob (7.0.8.7)
74-
activesupport (= 7.0.8.7)
74+
erubi (~> 1.11)
75+
rails-dom-testing (~> 2.2)
76+
rails-html-sanitizer (~> 1.6)
77+
activejob (7.1.5.1)
78+
activesupport (= 7.1.5.1)
7579
globalid (>= 0.3.6)
76-
activemodel (7.0.8.7)
77-
activesupport (= 7.0.8.7)
80+
activemodel (7.1.5.1)
81+
activesupport (= 7.1.5.1)
7882
activemodel-serializers-xml (1.0.3)
7983
activemodel (>= 5.0.0.a)
8084
activesupport (>= 5.0.0.a)
8185
builder (~> 3.1)
82-
activerecord (7.0.8.7)
83-
activemodel (= 7.0.8.7)
84-
activesupport (= 7.0.8.7)
85-
activestorage (7.0.8.7)
86-
actionpack (= 7.0.8.7)
87-
activejob (= 7.0.8.7)
88-
activerecord (= 7.0.8.7)
89-
activesupport (= 7.0.8.7)
86+
activerecord (7.1.5.1)
87+
activemodel (= 7.1.5.1)
88+
activesupport (= 7.1.5.1)
89+
timeout (>= 0.4.0)
90+
activestorage (7.1.5.1)
91+
actionpack (= 7.1.5.1)
92+
activejob (= 7.1.5.1)
93+
activerecord (= 7.1.5.1)
94+
activesupport (= 7.1.5.1)
9095
marcel (~> 1.0)
91-
mini_mime (>= 1.1.0)
92-
activesupport (7.0.8.7)
96+
activesupport (7.1.5.1)
97+
base64
98+
benchmark (>= 0.3)
99+
bigdecimal
93100
concurrent-ruby (~> 1.0, >= 1.0.2)
101+
connection_pool (>= 2.2.5)
102+
drb
94103
i18n (>= 1.6, < 2)
104+
logger (>= 1.4.2)
95105
minitest (>= 5.1)
106+
mutex_m
107+
securerandom (>= 0.3)
96108
tzinfo (~> 2.0)
97109
acts-as-taggable-on (11.0.0)
98110
activerecord (>= 7.0, < 8.0)
@@ -107,8 +119,9 @@ GEM
107119
ast (2.4.3)
108120
autoprefixer-rails (10.4.16.0)
109121
execjs (~> 2)
110-
base64 (0.2.0)
122+
base64 (0.3.0)
111123
bcrypt (3.1.20)
124+
benchmark (0.4.1)
112125
bigdecimal (3.2.2)
113126
bootsnap (1.18.6)
114127
msgpack (~> 1.2)
@@ -153,6 +166,7 @@ GEM
153166
execjs
154167
coffee-script-source (1.12.2)
155168
concurrent-ruby (1.3.5)
169+
connection_pool (2.5.3)
156170
countries (7.1.0)
157171
unaccent (~> 0.3)
158172
country_select (10.0.1)
@@ -183,6 +197,7 @@ GEM
183197
drb (2.2.3)
184198
dynamic_form (1.2.0)
185199
email_reply_parser_ffcrm (0.5.0)
200+
erb (5.0.2)
186201
erubi (1.13.1)
187202
execjs (2.10.0)
188203
factory_bot (6.5.4)
@@ -228,6 +243,11 @@ GEM
228243
image_processing (1.14.0)
229244
mini_magick (>= 4.9.5, < 6)
230245
ruby-vips (>= 2.0.17, < 3)
246+
io-console (0.8.1)
247+
irb (1.15.2)
248+
pp (>= 0.6.0)
249+
rdoc (>= 4.0.0)
250+
reline (>= 0.4.2)
231251
jquery-migrate-rails (1.2.1)
232252
jquery-rails (4.6.0)
233253
rails-dom-testing (>= 1, < 3)
@@ -264,7 +284,7 @@ GEM
264284
msgpack (1.8.0)
265285
mutex_m (0.3.0)
266286
nenv (0.3.0)
267-
net-imap (0.5.7)
287+
net-imap (0.5.9)
268288
date
269289
net-protocol
270290
net-pop (0.1.2)
@@ -275,7 +295,7 @@ GEM
275295
net-ssh (>= 2.6.5, < 8.0.0)
276296
net-sftp (4.0.0)
277297
net-ssh (>= 5.0.0, < 8.0.0)
278-
net-smtp (0.5.0)
298+
net-smtp (0.5.1)
279299
net-protocol
280300
net-ssh (7.3.0)
281301
nio4r (2.7.4)
@@ -297,37 +317,48 @@ GEM
297317
racc
298318
pg (1.5.9)
299319
popper_js (2.11.8)
320+
pp (0.6.2)
321+
prettyprint
300322
premailer (1.27.0)
301323
addressable
302324
css_parser (>= 1.19.0)
303325
htmlentities (>= 4.0.0)
326+
prettyprint (0.2.0)
304327
prism (1.4.0)
305328
pry (0.15.2)
306329
coderay (~> 1.1)
307330
method_source (~> 1.0)
308331
pry-rails (0.3.11)
309332
pry (>= 0.13.0)
333+
psych (5.2.6)
334+
date
335+
stringio
310336
public_suffix (6.0.1)
311337
puma (6.6.0)
312338
nio4r (~> 2.0)
313339
racc (1.8.1)
314-
rack (2.2.17)
340+
rack (3.1.16)
341+
rack-session (2.1.1)
342+
base64 (>= 0.1.0)
343+
rack (>= 3.0.0)
315344
rack-test (2.2.0)
316345
rack (>= 1.3)
317-
rails (7.0.8.7)
318-
actioncable (= 7.0.8.7)
319-
actionmailbox (= 7.0.8.7)
320-
actionmailer (= 7.0.8.7)
321-
actionpack (= 7.0.8.7)
322-
actiontext (= 7.0.8.7)
323-
actionview (= 7.0.8.7)
324-
activejob (= 7.0.8.7)
325-
activemodel (= 7.0.8.7)
326-
activerecord (= 7.0.8.7)
327-
activestorage (= 7.0.8.7)
328-
activesupport (= 7.0.8.7)
346+
rackup (2.2.1)
347+
rack (>= 3)
348+
rails (7.1.5.1)
349+
actioncable (= 7.1.5.1)
350+
actionmailbox (= 7.1.5.1)
351+
actionmailer (= 7.1.5.1)
352+
actionpack (= 7.1.5.1)
353+
actiontext (= 7.1.5.1)
354+
actionview (= 7.1.5.1)
355+
activejob (= 7.1.5.1)
356+
activemodel (= 7.1.5.1)
357+
activerecord (= 7.1.5.1)
358+
activestorage (= 7.1.5.1)
359+
activesupport (= 7.1.5.1)
329360
bundler (>= 1.15.0)
330-
railties (= 7.0.8.7)
361+
railties (= 7.1.5.1)
331362
rails-controller-testing (1.0.5)
332363
actionpack (>= 5.0.1.rc1)
333364
actionview (>= 5.0.1.rc1)
@@ -355,13 +386,14 @@ GEM
355386
railties (> 3.1)
356387
rails_serve_static_assets (0.0.5)
357388
rails_stdout_logging (0.0.5)
358-
railties (7.0.8.7)
359-
actionpack (= 7.0.8.7)
360-
activesupport (= 7.0.8.7)
361-
method_source
389+
railties (7.1.5.1)
390+
actionpack (= 7.1.5.1)
391+
activesupport (= 7.1.5.1)
392+
irb
393+
rackup (>= 1.0.0)
362394
rake (>= 12.2)
363-
thor (~> 1.0)
364-
zeitwerk (~> 2.5)
395+
thor (~> 1.0, >= 1.2.2)
396+
zeitwerk (~> 2.6)
365397
rainbow (3.1.1)
366398
rake (13.3.0)
367399
ransack (3.2.1)
@@ -378,7 +410,12 @@ GEM
378410
rb-fsevent (0.11.2)
379411
rb-inotify (0.11.1)
380412
ffi (~> 1.0)
413+
rdoc (6.14.2)
414+
erb
415+
psych (>= 4.0.0)
381416
regexp_parser (2.10.0)
417+
reline (0.6.2)
418+
io-console (~> 0.5)
382419
request_store (1.5.1)
383420
rack (>= 1.4)
384421
responders (3.1.1)
@@ -462,6 +499,7 @@ GEM
462499
sprockets (> 3.0)
463500
sprockets-rails
464501
tilt
502+
securerandom (0.4.1)
465503
select2-rails (4.0.13)
466504
selenium-webdriver (4.10.0)
467505
rexml (~> 3.2, >= 3.2.5)
@@ -486,6 +524,7 @@ GEM
486524
net-sftp (>= 2.1.2)
487525
net-ssh (>= 2.8.0)
488526
ostruct
527+
stringio (3.1.7)
489528
temple (0.10.3)
490529
thor (1.4.0)
491530
tilt (2.3.0)
@@ -508,13 +547,14 @@ GEM
508547
selenium-webdriver (~> 4.0, < 4.11)
509548
webrick (1.9.1)
510549
websocket (1.2.10)
511-
websocket-driver (0.7.6)
550+
websocket-driver (0.8.0)
551+
base64
512552
websocket-extensions (>= 0.1.0)
513553
websocket-extensions (0.1.5)
514554
will_paginate (4.0.1)
515555
xpath (3.2.0)
516556
nokogiri (~> 1.8)
517-
zeitwerk (2.6.18)
557+
zeitwerk (2.7.3)
518558
zeus (0.17.0)
519559
method_source (>= 0.6.7)
520560

@@ -573,7 +613,7 @@ DEPENDENCIES
573613
premailer
574614
pry-rails
575615
puma
576-
rails (>= 7.0.0, < 7.3.0)
616+
rails (>= 7.1.0, < 7.3.0)
577617
rails-controller-testing
578618
rails-i18n
579619
rails-observers

app/models/entities/account.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class Account < ActiveRecord::Base
4141
has_many :addresses, dependent: :destroy, as: :addressable, class_name: "Address" # advanced search uses this
4242
has_many :emails, as: :mediator
4343

44-
serialize :subscribed_users, Array
44+
serialize :subscribed_users, type: Array
4545

4646
accepts_nested_attributes_for :billing_address, allow_destroy: true, reject_if: proc { |attributes| Address.reject_address(attributes) }
4747
accepts_nested_attributes_for :shipping_address, allow_destroy: true, reject_if: proc { |attributes| Address.reject_address(attributes) }

app/models/entities/campaign.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class Campaign < ActiveRecord::Base
3939
has_many :opportunities, -> { order "id DESC" }
4040
has_many :emails, as: :mediator
4141

42-
serialize :subscribed_users, Array
42+
serialize :subscribed_users, type: Array
4343

4444
scope :state, lambda { |filters|
4545
where('status IN (?)' + (filters.delete('other') ? ' OR status IS NULL' : ''), filters)

app/models/entities/contact.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class Contact < ActiveRecord::Base
5757
has_ransackable_associations %w[account opportunities tags activities emails addresses comments tasks]
5858
ransack_can_autocomplete
5959

60-
serialize :subscribed_users, Array
60+
serialize :subscribed_users, type: Array
6161

6262
accepts_nested_attributes_for :business_address, allow_destroy: true, reject_if: proc { |attributes| Address.reject_address(attributes) }
6363

app/models/entities/lead.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class Lead < ActiveRecord::Base
4848
has_many :addresses, dependent: :destroy, as: :addressable, class_name: "Address" # advanced search uses this
4949
has_many :emails, as: :mediator
5050

51-
serialize :subscribed_users, Array
51+
serialize :subscribed_users, type: Array
5252

5353
accepts_nested_attributes_for :business_address, allow_destroy: true, reject_if: proc { |attributes| Address.reject_address(attributes) }
5454

app/models/entities/opportunity.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class Opportunity < ActiveRecord::Base
3838
has_many :tasks, as: :asset, dependent: :destroy # , :order => 'created_at DESC'
3939
has_many :emails, as: :mediator
4040

41-
serialize :subscribed_users, Array
41+
serialize :subscribed_users, type: Array
4242

4343
scope :state, lambda { |filters|
4444
where('stage IN (?)' + (filters.delete('other') ? ' OR stage IS NULL' : ''), filters)

app/models/fields/field.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
class Field < ActiveRecord::Base
3232
acts_as_list
3333

34-
serialize :collection, Array
34+
serialize :collection, type: Array
3535
serialize :settings, HashWithIndifferentAccess
3636

3737
belongs_to :field_group, optional: true

0 commit comments

Comments
 (0)