Skip to content

Commit fe4f7ff

Browse files
authored
Merge pull request #121 from maxbarsukov/dev
chore(deps): 🔗 bump `Rails` version
2 parents 820706c + 6d10305 commit fe4f7ff

File tree

3 files changed

+76
-76
lines changed

3 files changed

+76
-76
lines changed

Gemfile.lock

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -9,84 +9,84 @@ GIT
99
GEM
1010
remote: https://rubygems.org/
1111
specs:
12-
actioncable (7.0.2.4)
13-
actionpack (= 7.0.2.4)
14-
activesupport (= 7.0.2.4)
12+
actioncable (7.0.3)
13+
actionpack (= 7.0.3)
14+
activesupport (= 7.0.3)
1515
nio4r (~> 2.0)
1616
websocket-driver (>= 0.6.1)
17-
actionmailbox (7.0.2.4)
18-
actionpack (= 7.0.2.4)
19-
activejob (= 7.0.2.4)
20-
activerecord (= 7.0.2.4)
21-
activestorage (= 7.0.2.4)
22-
activesupport (= 7.0.2.4)
17+
actionmailbox (7.0.3)
18+
actionpack (= 7.0.3)
19+
activejob (= 7.0.3)
20+
activerecord (= 7.0.3)
21+
activestorage (= 7.0.3)
22+
activesupport (= 7.0.3)
2323
mail (>= 2.7.1)
2424
net-imap
2525
net-pop
2626
net-smtp
27-
actionmailer (7.0.2.4)
28-
actionpack (= 7.0.2.4)
29-
actionview (= 7.0.2.4)
30-
activejob (= 7.0.2.4)
31-
activesupport (= 7.0.2.4)
27+
actionmailer (7.0.3)
28+
actionpack (= 7.0.3)
29+
actionview (= 7.0.3)
30+
activejob (= 7.0.3)
31+
activesupport (= 7.0.3)
3232
mail (~> 2.5, >= 2.5.4)
3333
net-imap
3434
net-pop
3535
net-smtp
3636
rails-dom-testing (~> 2.0)
37-
actionpack (7.0.2.4)
38-
actionview (= 7.0.2.4)
39-
activesupport (= 7.0.2.4)
37+
actionpack (7.0.3)
38+
actionview (= 7.0.3)
39+
activesupport (= 7.0.3)
4040
rack (~> 2.0, >= 2.2.0)
4141
rack-test (>= 0.6.3)
4242
rails-dom-testing (~> 2.0)
4343
rails-html-sanitizer (~> 1.0, >= 1.2.0)
44-
actiontext (7.0.2.4)
45-
actionpack (= 7.0.2.4)
46-
activerecord (= 7.0.2.4)
47-
activestorage (= 7.0.2.4)
48-
activesupport (= 7.0.2.4)
44+
actiontext (7.0.3)
45+
actionpack (= 7.0.3)
46+
activerecord (= 7.0.3)
47+
activestorage (= 7.0.3)
48+
activesupport (= 7.0.3)
4949
globalid (>= 0.6.0)
5050
nokogiri (>= 1.8.5)
51-
actionview (7.0.2.4)
52-
activesupport (= 7.0.2.4)
51+
actionview (7.0.3)
52+
activesupport (= 7.0.3)
5353
builder (~> 3.1)
5454
erubi (~> 1.4)
5555
rails-dom-testing (~> 2.0)
5656
rails-html-sanitizer (~> 1.1, >= 1.2.0)
5757
active_record_doctor (1.9.0)
5858
activerecord (>= 4.2.0)
59-
activeadmin (2.11.2)
59+
activeadmin (2.13.0)
6060
arbre (~> 1.2, >= 1.2.1)
6161
formtastic (>= 3.1, < 5.0)
6262
formtastic_i18n (~> 0.4)
6363
inherited_resources (~> 1.7)
6464
jquery-rails (~> 4.2)
6565
kaminari (~> 1.0, >= 1.2.1)
66-
railties (>= 6.0, < 7.1)
67-
ransack (~> 2.1, >= 2.1.1)
68-
activejob (7.0.2.4)
69-
activesupport (= 7.0.2.4)
66+
railties (>= 6.1, < 7.1)
67+
ransack (>= 2.1.1, < 4)
68+
activejob (7.0.3)
69+
activesupport (= 7.0.3)
7070
globalid (>= 0.3.6)
71-
activemodel (7.0.2.4)
72-
activesupport (= 7.0.2.4)
71+
activemodel (7.0.3)
72+
activesupport (= 7.0.3)
7373
activemodel-serializers-xml (1.0.2)
7474
activemodel (> 5.x)
7575
activesupport (> 5.x)
7676
builder (~> 3.1)
77-
activerecord (7.0.2.4)
78-
activemodel (= 7.0.2.4)
79-
activesupport (= 7.0.2.4)
77+
activerecord (7.0.3)
78+
activemodel (= 7.0.3)
79+
activesupport (= 7.0.3)
8080
activerecord-import (1.4.0)
8181
activerecord (>= 4.2)
82-
activestorage (7.0.2.4)
83-
actionpack (= 7.0.2.4)
84-
activejob (= 7.0.2.4)
85-
activerecord (= 7.0.2.4)
86-
activesupport (= 7.0.2.4)
82+
activestorage (7.0.3)
83+
actionpack (= 7.0.3)
84+
activejob (= 7.0.3)
85+
activerecord (= 7.0.3)
86+
activesupport (= 7.0.3)
8787
marcel (~> 1.0)
8888
mini_mime (>= 1.1.0)
89-
activesupport (7.0.2.4)
89+
activesupport (7.0.3)
9090
concurrent-ruby (~> 1.0, >= 1.0.2)
9191
i18n (>= 1.6, < 2)
9292
minitest (>= 5.1)
@@ -112,15 +112,15 @@ GEM
112112
debug_inspector (>= 0.0.1)
113113
bootsnap (1.11.1)
114114
msgpack (~> 1.2)
115-
brakeman (5.2.2)
115+
brakeman (5.2.3)
116116
builder (3.2.4)
117117
bullet (7.0.1)
118118
activesupport (>= 3.0.0)
119119
uniform_notifier (~> 1.11)
120120
bundler-audit (0.9.0.1)
121121
bundler (>= 1.2.0, < 3)
122122
thor (~> 1.0)
123-
capybara (3.36.0)
123+
capybara (3.37.1)
124124
addressable
125125
matrix
126126
mini_mime (>= 0.1.3)
@@ -250,15 +250,15 @@ GEM
250250
activerecord
251251
kaminari-core (= 1.2.2)
252252
kaminari-core (1.2.2)
253-
kredis (1.1.0)
253+
kredis (1.2.0)
254254
activesupport (>= 6.0.0)
255255
redis (~> 4.2)
256256
launchy (2.5.0)
257257
addressable (~> 2.7)
258258
listen (3.7.1)
259259
rb-fsevent (~> 0.10, >= 0.10.3)
260260
rb-inotify (~> 0.9, >= 0.9.10)
261-
loofah (2.16.0)
261+
loofah (2.18.0)
262262
crass (~> 1.0.2)
263263
nokogiri (>= 1.5.9)
264264
mail (2.7.1)
@@ -286,7 +286,7 @@ GEM
286286
net-protocol
287287
timeout
288288
nio4r (2.5.8)
289-
nokogiri (1.13.4-x86_64-linux)
289+
nokogiri (1.13.6-x86_64-linux)
290290
racc (~> 1.4)
291291
oj (3.13.11)
292292
open-uri (0.2.0)
@@ -321,20 +321,20 @@ GEM
321321
rack (>= 1.2.0)
322322
rack-test (1.1.0)
323323
rack (>= 1.0, < 3)
324-
rails (7.0.2.4)
325-
actioncable (= 7.0.2.4)
326-
actionmailbox (= 7.0.2.4)
327-
actionmailer (= 7.0.2.4)
328-
actionpack (= 7.0.2.4)
329-
actiontext (= 7.0.2.4)
330-
actionview (= 7.0.2.4)
331-
activejob (= 7.0.2.4)
332-
activemodel (= 7.0.2.4)
333-
activerecord (= 7.0.2.4)
334-
activestorage (= 7.0.2.4)
335-
activesupport (= 7.0.2.4)
324+
rails (7.0.3)
325+
actioncable (= 7.0.3)
326+
actionmailbox (= 7.0.3)
327+
actionmailer (= 7.0.3)
328+
actionpack (= 7.0.3)
329+
actiontext (= 7.0.3)
330+
actionview (= 7.0.3)
331+
activejob (= 7.0.3)
332+
activemodel (= 7.0.3)
333+
activerecord (= 7.0.3)
334+
activestorage (= 7.0.3)
335+
activesupport (= 7.0.3)
336336
bundler (>= 1.15.0)
337-
railties (= 7.0.2.4)
337+
railties (= 7.0.3)
338338
rails-controller-testing (1.0.5)
339339
actionpack (>= 5.0.1.rc1)
340340
actionview (>= 5.0.1.rc1)
@@ -357,26 +357,26 @@ GEM
357357
json
358358
require_all (~> 3.0)
359359
ruby-progressbar
360-
railties (7.0.2.4)
361-
actionpack (= 7.0.2.4)
362-
activesupport (= 7.0.2.4)
360+
railties (7.0.3)
361+
actionpack (= 7.0.3)
362+
activesupport (= 7.0.3)
363363
method_source
364364
rake (>= 12.2)
365365
thor (~> 1.0)
366366
zeitwerk (~> 2.5)
367367
rainbow (3.1.1)
368368
rake (13.0.6)
369-
ransack (2.6.0)
370-
activerecord (>= 6.0.4)
371-
activesupport (>= 6.0.4)
369+
ransack (3.2.0)
370+
activerecord (>= 6.1.5)
371+
activesupport (>= 6.1.5)
372372
i18n
373373
rb-fsevent (0.11.1)
374374
rb-inotify (0.10.1)
375375
ffi (~> 1.0)
376376
rb-readline (0.5.5)
377377
rchardet (1.8.0)
378378
redis (4.6.0)
379-
regexp_parser (2.3.0)
379+
regexp_parser (2.4.0)
380380
reline (0.3.1)
381381
io-console (~> 0.5)
382382
request_store (1.5.1)
@@ -400,7 +400,7 @@ GEM
400400
rspec-mocks (3.11.1)
401401
diff-lcs (>= 1.2.0, < 2.0)
402402
rspec-support (~> 3.11.0)
403-
rspec-rails (5.1.1)
403+
rspec-rails (5.1.2)
404404
actionpack (>= 5.2)
405405
activesupport (>= 5.2)
406406
railties (>= 5.2)
@@ -487,10 +487,10 @@ GEM
487487
sprockets (>= 3.0.0)
488488
stimulus-rails (1.0.4)
489489
railties (>= 6.0.0)
490-
stringio (3.0.1)
490+
stringio (3.0.2)
491491
strong_migrations (1.0.0)
492492
activerecord (>= 5.2)
493-
strscan (3.0.1)
493+
strscan (3.0.3)
494494
sync (0.5.0)
495495
term-ansicolor (1.7.1)
496496
tins (~> 1.0)
@@ -499,7 +499,7 @@ GEM
499499
time (0.2.0)
500500
date
501501
timeout (0.2.0)
502-
tins (1.31.0)
502+
tins (1.31.1)
503503
sync
504504
turbo-rails (1.0.1)
505505
actionpack (>= 6.0.0)

app/queries/application_query.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ def initialize(collection, params)
66
# rubocop:disable Performance/MethodObjectAsBlock
77
def results
88
collection
9-
.yield_self(&method(:add_includes))
10-
.yield_self(&method(:sort))
11-
.yield_self(&method(:filter))
9+
.then(&method(:add_includes))
10+
.then(&method(:sort))
11+
.then(&method(:filter))
1212
end
1313
# rubocop:enable Performance/MethodObjectAsBlock
1414
end

db/fixtures/application_fixture.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
class ApplicationFixture
22
class << self
3-
# rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
3+
# rubocop:disable Metrics/AbcSize
44
def seed(options = {})
5-
options[:force] ||= ENV['force'] || 'false'
6-
options[:export] ||= ENV['export'] || 'true'
5+
options[:force] ||= ENV.fetch('force', 'false')
6+
options[:export] ||= ENV.fetch('export', 'true')
77

88
if klass.exists? && options[:force] != 'true'
99
puts "# #{klass_name.pluralize} already exists"
@@ -13,7 +13,7 @@ def seed(options = {})
1313
yield if block_given?
1414
DbCsvLoader.export_table(klass_name.downcase.pluralize) if options[:export] == 'true'
1515
end
16-
# rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
16+
# rubocop:enable Metrics/AbcSize
1717

1818
def import(array)
1919
klass.import! array

0 commit comments

Comments
 (0)