Skip to content

Commit 877990b

Browse files
committed
pull in thredded 6.1 support
1 parent 1d0c609 commit 877990b

File tree

1 file changed

+87
-87
lines changed

1 file changed

+87
-87
lines changed

Gemfile.lock

Lines changed: 87 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ GIT
1313

1414
GIT
1515
remote: https://github.com/indentlabs/thredded.git
16-
revision: b9a3976e310bb4eeb3f9a4b30d6c176d15a28ce1
16+
revision: 6ed40273e4696fc4f32013e4f2a101ff8658b960
1717
branch: feature/report-posts
1818
specs:
1919
thredded (0.16.16)
2020
active_record_union (>= 1.3.0)
2121
autoprefixer-rails
22-
db_text_search (~> 0.3.0)
22+
db_text_search (~> 0.3.2)
2323
friendly_id
2424
html-pipeline
2525
htmlentities
@@ -28,10 +28,10 @@ GIT
2828
kramdown (>= 2.0.0)
2929
kramdown-parser-gfm
3030
nokogiri
31-
onebox (~> 1.8, >= 1.8.99)
31+
onebox (>= 1.8.99)
3232
pundit (>= 1.1.0)
3333
rails (>= 4.2.10, != 6.0.0.rc2)
34-
rb-gravatar
34+
rails_gravatar
3535
rinku
3636
sanitize
3737
sassc-rails (>= 2.0.0)
@@ -41,38 +41,40 @@ GIT
4141
GEM
4242
remote: https://rubygems.org/
4343
specs:
44-
actioncable (6.0.3.4)
45-
actionpack (= 6.0.3.4)
44+
actioncable (6.1.4.1)
45+
actionpack (= 6.1.4.1)
46+
activesupport (= 6.1.4.1)
4647
nio4r (~> 2.0)
4748
websocket-driver (>= 0.6.1)
48-
actionmailbox (6.0.3.4)
49-
actionpack (= 6.0.3.4)
50-
activejob (= 6.0.3.4)
51-
activerecord (= 6.0.3.4)
52-
activestorage (= 6.0.3.4)
53-
activesupport (= 6.0.3.4)
49+
actionmailbox (6.1.4.1)
50+
actionpack (= 6.1.4.1)
51+
activejob (= 6.1.4.1)
52+
activerecord (= 6.1.4.1)
53+
activestorage (= 6.1.4.1)
54+
activesupport (= 6.1.4.1)
5455
mail (>= 2.7.1)
55-
actionmailer (6.0.3.4)
56-
actionpack (= 6.0.3.4)
57-
actionview (= 6.0.3.4)
58-
activejob (= 6.0.3.4)
56+
actionmailer (6.1.4.1)
57+
actionpack (= 6.1.4.1)
58+
actionview (= 6.1.4.1)
59+
activejob (= 6.1.4.1)
60+
activesupport (= 6.1.4.1)
5961
mail (~> 2.5, >= 2.5.4)
6062
rails-dom-testing (~> 2.0)
61-
actionpack (6.0.3.4)
62-
actionview (= 6.0.3.4)
63-
activesupport (= 6.0.3.4)
64-
rack (~> 2.0, >= 2.0.8)
63+
actionpack (6.1.4.1)
64+
actionview (= 6.1.4.1)
65+
activesupport (= 6.1.4.1)
66+
rack (~> 2.0, >= 2.0.9)
6567
rack-test (>= 0.6.3)
6668
rails-dom-testing (~> 2.0)
6769
rails-html-sanitizer (~> 1.0, >= 1.2.0)
68-
actiontext (6.0.3.4)
69-
actionpack (= 6.0.3.4)
70-
activerecord (= 6.0.3.4)
71-
activestorage (= 6.0.3.4)
72-
activesupport (= 6.0.3.4)
70+
actiontext (6.1.4.1)
71+
actionpack (= 6.1.4.1)
72+
activerecord (= 6.1.4.1)
73+
activestorage (= 6.1.4.1)
74+
activesupport (= 6.1.4.1)
7375
nokogiri (>= 1.8.5)
74-
actionview (6.0.3.4)
75-
activesupport (= 6.0.3.4)
76+
actionview (6.1.4.1)
77+
activesupport (= 6.1.4.1)
7678
builder (~> 3.1)
7779
erubi (~> 1.4)
7880
rails-dom-testing (~> 2.0)
@@ -81,37 +83,39 @@ GEM
8183
activerecord (>= 4.0)
8284
active_storage_validations (0.9.5)
8385
rails (>= 5.2.0)
84-
activejob (6.0.3.4)
85-
activesupport (= 6.0.3.4)
86+
activejob (6.1.4.1)
87+
activesupport (= 6.1.4.1)
8688
globalid (>= 0.3.6)
87-
activemodel (6.0.3.4)
88-
activesupport (= 6.0.3.4)
89+
activemodel (6.1.4.1)
90+
activesupport (= 6.1.4.1)
8991
activemodel-serializers-xml (1.0.2)
9092
activemodel (> 5.x)
9193
activesupport (> 5.x)
9294
builder (~> 3.1)
93-
activerecord (6.0.3.4)
94-
activemodel (= 6.0.3.4)
95-
activesupport (= 6.0.3.4)
96-
activestorage (6.0.3.4)
97-
actionpack (= 6.0.3.4)
98-
activejob (= 6.0.3.4)
99-
activerecord (= 6.0.3.4)
100-
marcel (~> 0.3.1)
101-
activesupport (6.0.3.4)
95+
activerecord (6.1.4.1)
96+
activemodel (= 6.1.4.1)
97+
activesupport (= 6.1.4.1)
98+
activestorage (6.1.4.1)
99+
actionpack (= 6.1.4.1)
100+
activejob (= 6.1.4.1)
101+
activerecord (= 6.1.4.1)
102+
activesupport (= 6.1.4.1)
103+
marcel (~> 1.0.0)
104+
mini_mime (>= 1.1.0)
105+
activesupport (6.1.4.1)
102106
concurrent-ruby (~> 1.0, >= 1.0.2)
103-
i18n (>= 0.7, < 2)
104-
minitest (~> 5.1)
105-
tzinfo (~> 1.1)
106-
zeitwerk (~> 2.2, >= 2.2.2)
107+
i18n (>= 1.6, < 2)
108+
minitest (>= 5.1)
109+
tzinfo (~> 2.0)
110+
zeitwerk (~> 2.3)
107111
acts_as_list (1.0.4)
108112
activerecord (>= 4.2)
109-
addressable (2.7.0)
113+
addressable (2.8.0)
110114
public_suffix (>= 2.0.2, < 5.0)
111115
authority (3.3.0)
112116
activesupport (>= 3.0.0)
113-
autoprefixer-rails (9.8.4)
114-
execjs
117+
autoprefixer-rails (10.3.3.0)
118+
execjs (~> 2)
115119
aws-eventstream (1.2.0)
116120
aws-partitions (1.503.0)
117121
aws-sdk (3.1.0)
@@ -1288,7 +1292,7 @@ GEM
12881292
database_cleaner-core (2.0.1)
12891293
dateslices (0.0.4)
12901294
rails (> 4)
1291-
db_text_search (0.3.1)
1295+
db_text_search (0.3.2)
12921296
activerecord (>= 4.1.15, < 7.0)
12931297
debug_inspector (1.0.0)
12941298
devise (4.8.0)
@@ -1303,7 +1307,7 @@ GEM
13031307
engtagger (0.2.1)
13041308
erubi (1.10.0)
13051309
eventmachine (1.2.7)
1306-
execjs (2.7.0)
1310+
execjs (2.8.1)
13071311
faraday (0.17.3)
13081312
multipart-post (>= 1.2, < 3)
13091313
faraday_middleware (0.14.0)
@@ -1319,7 +1323,7 @@ GEM
13191323
flamegraph (0.9.5)
13201324
font-awesome-rails (4.7.0.7)
13211325
railties (>= 3.2, < 7)
1322-
friendly_id (5.3.0)
1326+
friendly_id (5.4.2)
13231327
activerecord (>= 4.0.0)
13241328
globalid (0.5.2)
13251329
activesupport (>= 5.0)
@@ -1356,7 +1360,7 @@ GEM
13561360
image_processing (1.12.1)
13571361
mini_magick (>= 4.9.5, < 5)
13581362
ruby-vips (>= 2.0.17, < 3)
1359-
inline_svg (1.7.1)
1363+
inline_svg (1.7.2)
13601364
activesupport (>= 3.0)
13611365
nokogiri (>= 1.6)
13621366
jmespath (1.4.0)
@@ -1394,8 +1398,7 @@ GEM
13941398
nokogiri (>= 1.5.9)
13951399
mail (2.7.1)
13961400
mini_mime (>= 0.1.1)
1397-
marcel (0.3.3)
1398-
mimemagic (~> 0.3.2)
1401+
marcel (1.0.2)
13991402
material_icons (2.2.1)
14001403
railties (>= 3.2)
14011404
medium-editor-rails (2.3.1)
@@ -1411,7 +1414,7 @@ GEM
14111414
nokogiri (~> 1)
14121415
rake
14131416
mini_magick (4.11.0)
1414-
mini_mime (1.1.0)
1417+
mini_mime (1.1.2)
14151418
mini_portile2 (2.6.1)
14161419
mini_racer (0.4.0)
14171420
libv8-node (~> 15.14.0.0)
@@ -1425,10 +1428,8 @@ GEM
14251428
nokogiri (1.12.5)
14261429
mini_portile2 (~> 2.6.1)
14271430
racc (~> 1.4)
1428-
nokogumbo (2.0.2)
1429-
nokogiri (~> 1.8, >= 1.8.4)
1430-
onebox (1.9.29)
1431-
addressable (~> 2.7.0)
1431+
onebox (2.2.19)
1432+
addressable (~> 2.8.0)
14321433
htmlentities (~> 4.3)
14331434
multi_json (~> 1.11)
14341435
mustache
@@ -1459,9 +1460,9 @@ GEM
14591460
nio4r (~> 2.0)
14601461
puma-heroku (2.0.0)
14611462
puma (>= 5.0, < 6.0)
1462-
pundit (2.1.0)
1463+
pundit (2.1.1)
14631464
activesupport (>= 3.0.0)
1464-
racc (1.5.2)
1465+
racc (1.6.0)
14651466
rack (2.2.3)
14661467
rack-mini-profiler (2.3.3)
14671468
rack (>= 1.2.0)
@@ -1472,20 +1473,20 @@ GEM
14721473
rack
14731474
rack-test (1.1.0)
14741475
rack (>= 1.0, < 3)
1475-
rails (6.0.3.4)
1476-
actioncable (= 6.0.3.4)
1477-
actionmailbox (= 6.0.3.4)
1478-
actionmailer (= 6.0.3.4)
1479-
actionpack (= 6.0.3.4)
1480-
actiontext (= 6.0.3.4)
1481-
actionview (= 6.0.3.4)
1482-
activejob (= 6.0.3.4)
1483-
activemodel (= 6.0.3.4)
1484-
activerecord (= 6.0.3.4)
1485-
activestorage (= 6.0.3.4)
1486-
activesupport (= 6.0.3.4)
1487-
bundler (>= 1.3.0)
1488-
railties (= 6.0.3.4)
1476+
rails (6.1.4.1)
1477+
actioncable (= 6.1.4.1)
1478+
actionmailbox (= 6.1.4.1)
1479+
actionmailer (= 6.1.4.1)
1480+
actionpack (= 6.1.4.1)
1481+
actiontext (= 6.1.4.1)
1482+
actionview (= 6.1.4.1)
1483+
activejob (= 6.1.4.1)
1484+
activemodel (= 6.1.4.1)
1485+
activerecord (= 6.1.4.1)
1486+
activestorage (= 6.1.4.1)
1487+
activesupport (= 6.1.4.1)
1488+
bundler (>= 1.15.0)
1489+
railties (= 6.1.4.1)
14891490
sprockets-rails (>= 2.0.0)
14901491
rails-dom-testing (2.0.3)
14911492
activesupport (>= 4.2.0)
@@ -1508,15 +1509,16 @@ GEM
15081509
rails (>= 5.0, < 7)
15091510
remotipart (~> 1.3)
15101511
sassc-rails (>= 1.3, < 3)
1511-
railties (6.0.3.4)
1512-
actionpack (= 6.0.3.4)
1513-
activesupport (= 6.0.3.4)
1512+
rails_gravatar (1.0.4)
1513+
actionview
1514+
railties (6.1.4.1)
1515+
actionpack (= 6.1.4.1)
1516+
activesupport (= 6.1.4.1)
15141517
method_source
1515-
rake (>= 0.8.7)
1516-
thor (>= 0.20.3, < 2.0)
1518+
rake (>= 0.13)
1519+
thor (~> 1.0)
15171520
rake (13.0.6)
15181521
rb-fsevent (0.11.0)
1519-
rb-gravatar (1.0.5)
15201522
rb-inotify (0.10.1)
15211523
ffi (~> 1.0)
15221524
react-rails (2.6.1)
@@ -1537,10 +1539,9 @@ GEM
15371539
ruby-vips (2.0.17)
15381540
ffi (~> 1.9)
15391541
rubyzip (2.0.0)
1540-
sanitize (5.2.1)
1542+
sanitize (6.0.0)
15411543
crass (~> 1.0.2)
1542-
nokogiri (>= 1.8.0)
1543-
nokogumbo (~> 2.0)
1544+
nokogiri (>= 1.12.0)
15441545
sass-rails (6.0.0)
15451546
sassc-rails (~> 2.1, >= 2.1.1)
15461547
sassc (2.4.0)
@@ -1590,12 +1591,11 @@ GEM
15901591
textstat (0.1.6)
15911592
text-hyphen (~> 1.4, >= 1.4.1)
15921593
thor (1.1.0)
1593-
thread_safe (0.3.6)
15941594
tilt (2.0.10)
15951595
timeago_js (3.0.2.2)
15961596
tribute (3.6.0.0)
1597-
tzinfo (1.2.9)
1598-
thread_safe (~> 0.1)
1597+
tzinfo (2.0.4)
1598+
concurrent-ruby (~> 1.0)
15991599
uglifier (4.2.0)
16001600
execjs (>= 0.3.0, < 3)
16011601
unf (0.1.4)
@@ -1619,7 +1619,7 @@ GEM
16191619
websocket-extensions (0.1.5)
16201620
word_count_analyzer (1.0.1)
16211621
engtagger
1622-
zeitwerk (2.4.2)
1622+
zeitwerk (2.5.1)
16231623

16241624
PLATFORMS
16251625
ruby

0 commit comments

Comments
 (0)