trusty-cms 6.3 → 7.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +118 -70
- data/app/assets/javascripts/admin/custom_file_upload.js +5 -5
- data/app/controllers/admin/assets_controller.rb +2 -2
- data/app/helpers/admin/references_helper.rb +3 -3
- data/app/views/admin/assets/new.html.haml +0 -1
- data/config/application.rb +2 -1
- data/lib/trusty_cms/extension_loader.rb +0 -1
- data/lib/trusty_cms/initializer.rb +7 -6
- data/lib/trusty_cms/version.rb +1 -1
- data/spec/dummy/config/application.rb +3 -3
- data/trusty_cms.gemspec +5 -1
- metadata +60 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 757c811a343c2e361cba40efbb19e65643d9685ec8e361dab2ed97c6876c1261
|
4
|
+
data.tar.gz: d6ac859204a5f6f92708ddf194666c52a5b4b536c0d22099cd072f52e9196f0e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ee0cd37d1046d1a9b657912619af9b831bba79dad31556db8b15158a5611280c74d33ee43bf0752ffa34538af0609e664f0542688ccb0177044f7a0d28392a47
|
7
|
+
data.tar.gz: 4e59b6c26564c3fda61dc9dea53ac8b4fd883f64520ab3595c9c7b77b5812128f0e061cd7711f613203e9c8323db1d14f2af9b8249cbb57bf6c666fb3e39c273
|
data/Gemfile.lock
CHANGED
@@ -1,14 +1,17 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
trusty-cms (
|
4
|
+
trusty-cms (7.0.1)
|
5
5
|
RedCloth (= 4.3.3)
|
6
6
|
activestorage-validator
|
7
7
|
acts_as_list (>= 0.9.5, < 1.3.0)
|
8
8
|
acts_as_tree (~> 2.9.1)
|
9
|
+
base64
|
10
|
+
bigdecimal
|
9
11
|
ckeditor (>= 4.2.2, < 4.4.0)
|
10
12
|
delocalize (>= 0.2, < 2.0)
|
11
13
|
devise
|
14
|
+
drb
|
12
15
|
execjs (~> 2.7)
|
13
16
|
haml (>= 5.0, < 6.0)
|
14
17
|
haml-rails
|
@@ -16,11 +19,12 @@ PATH
|
|
16
19
|
image_processing
|
17
20
|
kraken-io
|
18
21
|
mini_racer
|
22
|
+
mutex_m
|
19
23
|
mysql2
|
20
24
|
rack (>= 2.0.1, < 3.1.0)
|
21
25
|
rack-cache (~> 1.7)
|
22
26
|
radius (~> 0.7)
|
23
|
-
rails (~>
|
27
|
+
rails (~> 7.0.0)
|
24
28
|
rake (< 14.0)
|
25
29
|
ransack
|
26
30
|
rdoc (>= 5.1, < 7.0)
|
@@ -35,67 +39,73 @@ GEM
|
|
35
39
|
remote: https://rubygems.org/
|
36
40
|
specs:
|
37
41
|
RedCloth (4.3.3)
|
38
|
-
actioncable (
|
39
|
-
actionpack (=
|
40
|
-
activesupport (=
|
42
|
+
actioncable (7.0.8.4)
|
43
|
+
actionpack (= 7.0.8.4)
|
44
|
+
activesupport (= 7.0.8.4)
|
41
45
|
nio4r (~> 2.0)
|
42
46
|
websocket-driver (>= 0.6.1)
|
43
|
-
actionmailbox (
|
44
|
-
actionpack (=
|
45
|
-
activejob (=
|
46
|
-
activerecord (=
|
47
|
-
activestorage (=
|
48
|
-
activesupport (=
|
47
|
+
actionmailbox (7.0.8.4)
|
48
|
+
actionpack (= 7.0.8.4)
|
49
|
+
activejob (= 7.0.8.4)
|
50
|
+
activerecord (= 7.0.8.4)
|
51
|
+
activestorage (= 7.0.8.4)
|
52
|
+
activesupport (= 7.0.8.4)
|
49
53
|
mail (>= 2.7.1)
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
54
|
+
net-imap
|
55
|
+
net-pop
|
56
|
+
net-smtp
|
57
|
+
actionmailer (7.0.8.4)
|
58
|
+
actionpack (= 7.0.8.4)
|
59
|
+
actionview (= 7.0.8.4)
|
60
|
+
activejob (= 7.0.8.4)
|
61
|
+
activesupport (= 7.0.8.4)
|
55
62
|
mail (~> 2.5, >= 2.5.4)
|
63
|
+
net-imap
|
64
|
+
net-pop
|
65
|
+
net-smtp
|
56
66
|
rails-dom-testing (~> 2.0)
|
57
|
-
actionpack (
|
58
|
-
actionview (=
|
59
|
-
activesupport (=
|
60
|
-
rack (~> 2.0, >= 2.
|
67
|
+
actionpack (7.0.8.4)
|
68
|
+
actionview (= 7.0.8.4)
|
69
|
+
activesupport (= 7.0.8.4)
|
70
|
+
rack (~> 2.0, >= 2.2.4)
|
61
71
|
rack-test (>= 0.6.3)
|
62
72
|
rails-dom-testing (~> 2.0)
|
63
73
|
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
64
|
-
actiontext (
|
65
|
-
actionpack (=
|
66
|
-
activerecord (=
|
67
|
-
activestorage (=
|
68
|
-
activesupport (=
|
74
|
+
actiontext (7.0.8.4)
|
75
|
+
actionpack (= 7.0.8.4)
|
76
|
+
activerecord (= 7.0.8.4)
|
77
|
+
activestorage (= 7.0.8.4)
|
78
|
+
activesupport (= 7.0.8.4)
|
79
|
+
globalid (>= 0.6.0)
|
69
80
|
nokogiri (>= 1.8.5)
|
70
|
-
actionview (
|
71
|
-
activesupport (=
|
81
|
+
actionview (7.0.8.4)
|
82
|
+
activesupport (= 7.0.8.4)
|
72
83
|
builder (~> 3.1)
|
73
84
|
erubi (~> 1.4)
|
74
85
|
rails-dom-testing (~> 2.0)
|
75
86
|
rails-html-sanitizer (~> 1.1, >= 1.2.0)
|
76
|
-
activejob (
|
77
|
-
activesupport (=
|
87
|
+
activejob (7.0.8.4)
|
88
|
+
activesupport (= 7.0.8.4)
|
78
89
|
globalid (>= 0.3.6)
|
79
|
-
activemodel (
|
80
|
-
activesupport (=
|
81
|
-
activerecord (
|
82
|
-
activemodel (=
|
83
|
-
activesupport (=
|
84
|
-
activestorage (
|
85
|
-
actionpack (=
|
86
|
-
activejob (=
|
87
|
-
activerecord (=
|
88
|
-
activesupport (=
|
90
|
+
activemodel (7.0.8.4)
|
91
|
+
activesupport (= 7.0.8.4)
|
92
|
+
activerecord (7.0.8.4)
|
93
|
+
activemodel (= 7.0.8.4)
|
94
|
+
activesupport (= 7.0.8.4)
|
95
|
+
activestorage (7.0.8.4)
|
96
|
+
actionpack (= 7.0.8.4)
|
97
|
+
activejob (= 7.0.8.4)
|
98
|
+
activerecord (= 7.0.8.4)
|
99
|
+
activesupport (= 7.0.8.4)
|
89
100
|
marcel (~> 1.0)
|
90
101
|
mini_mime (>= 1.1.0)
|
91
102
|
activestorage-validator (0.4.0)
|
92
103
|
rails (>= 6.1.0)
|
93
|
-
activesupport (
|
104
|
+
activesupport (7.0.8.4)
|
94
105
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
95
106
|
i18n (>= 1.6, < 2)
|
96
107
|
minitest (>= 5.1)
|
97
108
|
tzinfo (~> 2.0)
|
98
|
-
zeitwerk (~> 2.3)
|
99
109
|
acts_as_list (1.2.2)
|
100
110
|
activerecord (>= 6.1)
|
101
111
|
activesupport (>= 6.1)
|
@@ -103,7 +113,9 @@ GEM
|
|
103
113
|
activerecord (>= 3.0.0)
|
104
114
|
addressable (2.8.7)
|
105
115
|
public_suffix (>= 2.0.2, < 7.0)
|
116
|
+
base64 (0.2.0)
|
106
117
|
bcrypt (3.1.20)
|
118
|
+
bigdecimal (3.1.8)
|
107
119
|
builder (3.3.0)
|
108
120
|
byebug (11.1.3)
|
109
121
|
capybara (3.40.0)
|
@@ -145,6 +157,7 @@ GEM
|
|
145
157
|
warden (~> 1.2.3)
|
146
158
|
diff-lcs (1.5.1)
|
147
159
|
docile (1.4.1)
|
160
|
+
drb (2.2.1)
|
148
161
|
erubi (1.13.0)
|
149
162
|
execjs (2.9.1)
|
150
163
|
factory_bot (6.5.0)
|
@@ -152,8 +165,16 @@ GEM
|
|
152
165
|
factory_bot_rails (6.4.2)
|
153
166
|
factory_bot (~> 6.4)
|
154
167
|
railties (>= 5.0.0)
|
168
|
+
ffi (1.17.0-aarch64-linux-gnu)
|
169
|
+
ffi (1.17.0-aarch64-linux-musl)
|
170
|
+
ffi (1.17.0-arm-linux-gnu)
|
171
|
+
ffi (1.17.0-arm-linux-musl)
|
172
|
+
ffi (1.17.0-arm64-darwin)
|
173
|
+
ffi (1.17.0-x86-linux-gnu)
|
174
|
+
ffi (1.17.0-x86-linux-musl)
|
155
175
|
ffi (1.17.0-x86_64-darwin)
|
156
176
|
ffi (1.17.0-x86_64-linux-gnu)
|
177
|
+
ffi (1.17.0-x86_64-linux-musl)
|
157
178
|
file_validators (3.0.0)
|
158
179
|
activemodel (>= 3.2)
|
159
180
|
mime-types (>= 1.0)
|
@@ -188,8 +209,13 @@ GEM
|
|
188
209
|
launchy (3.0.1)
|
189
210
|
addressable (~> 2.8)
|
190
211
|
childprocess (~> 5.0)
|
212
|
+
libv8-node (18.19.0.0)
|
213
|
+
libv8-node (18.19.0.0-aarch64-linux)
|
214
|
+
libv8-node (18.19.0.0-aarch64-linux-musl)
|
215
|
+
libv8-node (18.19.0.0-arm64-darwin)
|
191
216
|
libv8-node (18.19.0.0-x86_64-darwin)
|
192
217
|
libv8-node (18.19.0.0-x86_64-linux)
|
218
|
+
libv8-node (18.19.0.0-x86_64-linux-musl)
|
193
219
|
logger (1.6.1)
|
194
220
|
loofah (2.22.0)
|
195
221
|
crass (~> 1.0.2)
|
@@ -202,16 +228,19 @@ GEM
|
|
202
228
|
marcel (1.0.4)
|
203
229
|
matrix (0.4.2)
|
204
230
|
method_source (1.1.0)
|
205
|
-
mime-types (3.
|
231
|
+
mime-types (3.6.0)
|
232
|
+
logger
|
206
233
|
mime-types-data (~> 3.2015)
|
207
|
-
mime-types-data (3.2024.
|
234
|
+
mime-types-data (3.2024.1001)
|
208
235
|
mini_magick (4.13.2)
|
209
236
|
mini_mime (1.1.5)
|
210
237
|
mini_racer (0.16.0)
|
211
238
|
libv8-node (~> 18.19.0.0)
|
212
239
|
minitest (5.25.1)
|
213
|
-
multi_xml (0.
|
240
|
+
multi_xml (0.7.1)
|
241
|
+
bigdecimal (~> 3.1)
|
214
242
|
multipart-post (2.4.1)
|
243
|
+
mutex_m (0.2.0)
|
215
244
|
mysql2 (0.5.6)
|
216
245
|
net-imap (0.4.16)
|
217
246
|
date
|
@@ -223,6 +252,14 @@ GEM
|
|
223
252
|
net-smtp (0.5.0)
|
224
253
|
net-protocol
|
225
254
|
nio4r (2.7.3)
|
255
|
+
nokogiri (1.16.7-aarch64-linux)
|
256
|
+
racc (~> 1.4)
|
257
|
+
nokogiri (1.16.7-arm-linux)
|
258
|
+
racc (~> 1.4)
|
259
|
+
nokogiri (1.16.7-arm64-darwin)
|
260
|
+
racc (~> 1.4)
|
261
|
+
nokogiri (1.16.7-x86-linux)
|
262
|
+
racc (~> 1.4)
|
226
263
|
nokogiri (1.16.7-x86_64-darwin)
|
227
264
|
racc (~> 1.4)
|
228
265
|
nokogiri (1.16.7-x86_64-linux)
|
@@ -248,21 +285,20 @@ GEM
|
|
248
285
|
rack-test (2.1.0)
|
249
286
|
rack (>= 1.3)
|
250
287
|
radius (0.7.5)
|
251
|
-
rails (
|
252
|
-
actioncable (=
|
253
|
-
actionmailbox (=
|
254
|
-
actionmailer (=
|
255
|
-
actionpack (=
|
256
|
-
actiontext (=
|
257
|
-
actionview (=
|
258
|
-
activejob (=
|
259
|
-
activemodel (=
|
260
|
-
activerecord (=
|
261
|
-
activestorage (=
|
262
|
-
activesupport (=
|
288
|
+
rails (7.0.8.4)
|
289
|
+
actioncable (= 7.0.8.4)
|
290
|
+
actionmailbox (= 7.0.8.4)
|
291
|
+
actionmailer (= 7.0.8.4)
|
292
|
+
actionpack (= 7.0.8.4)
|
293
|
+
actiontext (= 7.0.8.4)
|
294
|
+
actionview (= 7.0.8.4)
|
295
|
+
activejob (= 7.0.8.4)
|
296
|
+
activemodel (= 7.0.8.4)
|
297
|
+
activerecord (= 7.0.8.4)
|
298
|
+
activestorage (= 7.0.8.4)
|
299
|
+
activesupport (= 7.0.8.4)
|
263
300
|
bundler (>= 1.15.0)
|
264
|
-
railties (=
|
265
|
-
sprockets-rails (>= 2.0.0)
|
301
|
+
railties (= 7.0.8.4)
|
266
302
|
rails-dom-testing (2.2.0)
|
267
303
|
activesupport (>= 5.0.0)
|
268
304
|
minitest
|
@@ -272,12 +308,13 @@ GEM
|
|
272
308
|
nokogiri (~> 1.14)
|
273
309
|
rails-observers (0.1.5)
|
274
310
|
activemodel (>= 4.0)
|
275
|
-
railties (
|
276
|
-
actionpack (=
|
277
|
-
activesupport (=
|
311
|
+
railties (7.0.8.4)
|
312
|
+
actionpack (= 7.0.8.4)
|
313
|
+
activesupport (= 7.0.8.4)
|
278
314
|
method_source
|
279
315
|
rake (>= 12.2)
|
280
316
|
thor (~> 1.0)
|
317
|
+
zeitwerk (~> 2.5)
|
281
318
|
rake (13.2.1)
|
282
319
|
ransack (4.2.1)
|
283
320
|
activerecord (>= 6.1.5)
|
@@ -302,13 +339,13 @@ GEM
|
|
302
339
|
rspec-expectations (3.13.3)
|
303
340
|
diff-lcs (>= 1.2.0, < 2.0)
|
304
341
|
rspec-support (~> 3.13.0)
|
305
|
-
rspec-mocks (3.13.
|
342
|
+
rspec-mocks (3.13.2)
|
306
343
|
diff-lcs (>= 1.2.0, < 2.0)
|
307
344
|
rspec-support (~> 3.13.0)
|
308
|
-
rspec-rails (
|
309
|
-
actionpack (>=
|
310
|
-
activesupport (>=
|
311
|
-
railties (>=
|
345
|
+
rspec-rails (7.0.1)
|
346
|
+
actionpack (>= 7.0)
|
347
|
+
activesupport (>= 7.0)
|
348
|
+
railties (>= 7.0)
|
312
349
|
rspec-core (~> 3.13)
|
313
350
|
rspec-expectations (~> 3.13)
|
314
351
|
rspec-mocks (~> 3.13)
|
@@ -352,7 +389,7 @@ GEM
|
|
352
389
|
rake
|
353
390
|
tzinfo (2.0.6)
|
354
391
|
concurrent-ruby (~> 1.0)
|
355
|
-
uglifier (4.2.
|
392
|
+
uglifier (4.2.1)
|
356
393
|
execjs (>= 0.3.0, < 3)
|
357
394
|
warden (1.2.9)
|
358
395
|
rack (>= 2.0.9)
|
@@ -365,9 +402,20 @@ GEM
|
|
365
402
|
zeitwerk (2.6.18)
|
366
403
|
|
367
404
|
PLATFORMS
|
368
|
-
|
369
|
-
|
405
|
+
aarch64-linux
|
406
|
+
aarch64-linux-gnu
|
407
|
+
aarch64-linux-musl
|
408
|
+
arm-linux
|
409
|
+
arm-linux-gnu
|
410
|
+
arm-linux-musl
|
411
|
+
arm64-darwin
|
412
|
+
x86-linux
|
413
|
+
x86-linux-gnu
|
414
|
+
x86-linux-musl
|
415
|
+
x86_64-darwin
|
370
416
|
x86_64-linux
|
417
|
+
x86_64-linux-gnu
|
418
|
+
x86_64-linux-musl
|
371
419
|
|
372
420
|
DEPENDENCIES
|
373
421
|
activestorage-validator
|
@@ -388,4 +436,4 @@ DEPENDENCIES
|
|
388
436
|
trustygems (~> 0.2.0)
|
389
437
|
|
390
438
|
BUNDLED WITH
|
391
|
-
2.5.
|
439
|
+
2.5.21
|
@@ -1,7 +1,7 @@
|
|
1
1
|
$(function () {
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
2
|
+
const fileUpload = $('#asset_asset');
|
3
|
+
const fileChosen = $('#file-chosen');
|
4
|
+
fileUpload.on('change', function () {
|
5
|
+
fileChosen.text(this.files[0].name)
|
6
|
+
})
|
7
7
|
});
|
@@ -35,7 +35,7 @@ class Admin::AssetsController < Admin::ResourceController
|
|
35
35
|
@assets = []
|
36
36
|
@page_attachments = []
|
37
37
|
compress = current_site.try(:compress).nil? ? true : current_site.compress
|
38
|
-
asset_params[:asset][:asset].
|
38
|
+
asset_params[:asset][:asset].reject(&:blank?).each do |uploaded_asset|
|
39
39
|
if uploaded_asset.content_type == 'application/octet-stream'
|
40
40
|
flash[:notice] = 'Please only upload assets that have a valid extension in the name.'
|
41
41
|
else
|
@@ -90,6 +90,6 @@ class Admin::AssetsController < Admin::ResourceController
|
|
90
90
|
end
|
91
91
|
|
92
92
|
def asset_params
|
93
|
-
params.permit(:id, :for_attachment, asset: [:
|
93
|
+
params.permit(:id, :for_attachment, asset: [:for_attachment, { asset: [] }])
|
94
94
|
end
|
95
95
|
end
|
@@ -5,7 +5,7 @@ module Admin::ReferencesHelper
|
|
5
5
|
String.new.tap do |output|
|
6
6
|
class_of_page.tag_descriptions.sort.each do |tag_name, description|
|
7
7
|
value = t("desc.#{tag_name.gsub(':', '-')}").match('desc') ? description : t("desc.#{tag_name.gsub(':', '-')}")
|
8
|
-
output << render(partial: 'admin/references/tag_reference
|
8
|
+
output << render(partial: 'admin/references/tag_reference',
|
9
9
|
locals: { tag_name: tag_name,
|
10
10
|
description: RedCloth.new(TrustyCms::Taggable::Util.strip_leading_whitespace(value)).to_html })
|
11
11
|
end
|
@@ -35,8 +35,8 @@ module Admin::ReferencesHelper
|
|
35
35
|
|
36
36
|
def filter
|
37
37
|
@filter ||= begin
|
38
|
-
|
39
|
-
|
38
|
+
TextFilter.find_descendant(params[:filter_name])
|
39
|
+
end
|
40
40
|
end
|
41
41
|
|
42
42
|
def class_of_page
|
@@ -8,7 +8,6 @@
|
|
8
8
|
|
9
9
|
- main.edit_form do
|
10
10
|
- form_for :asset, :url => admin_assets_path, :html => { :method => "post", :multipart => true } do |f|
|
11
|
-
= render :partial => "form", :locals => { :f => f }
|
12
11
|
%fieldset
|
13
12
|
%label.custom-file-upload
|
14
13
|
= t("clipped_extension.choose_file")
|
data/config/application.rb
CHANGED
@@ -67,7 +67,7 @@ module TrustyCms
|
|
67
67
|
|
68
68
|
# Make Active Record use UTC-base instead of local time
|
69
69
|
config.time_zone = 'UTC'
|
70
|
-
|
70
|
+
config.legacy_connection_handling = false
|
71
71
|
# Set the default field error proc
|
72
72
|
config.action_view.field_error_proc = Proc.new do |html, instance|
|
73
73
|
if html !~ /label/
|
@@ -76,6 +76,7 @@ module TrustyCms
|
|
76
76
|
html
|
77
77
|
end
|
78
78
|
end
|
79
|
+
|
79
80
|
config.to_prepare do
|
80
81
|
extension_loader.deactivate_extensions
|
81
82
|
extension_loader.load_extensions
|
@@ -65,7 +65,6 @@ module TrustyCms
|
|
65
65
|
#
|
66
66
|
def load_extensions
|
67
67
|
configuration = TrustyCms::Application.config
|
68
|
-
# @observer ||= DependenciesObserver.new(configuration).observe(::ActiveSupport::Dependencies)
|
69
68
|
self.extensions = configuration.enabled_extensions.map { |ext| load_extension(ext) }.compact
|
70
69
|
end
|
71
70
|
|
@@ -56,12 +56,13 @@ module TrustyCms
|
|
56
56
|
|
57
57
|
# Extends the Rails initializer to add plugin paths in extensions
|
58
58
|
# and makes extension load paths reloadable (eg in development mode)
|
59
|
-
#
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
59
|
+
# ActiveSupport::Dependencies has been deprecated. We imported all the gems a long
|
60
|
+
# time ago. This is a relic of the past. We should remove it and any references to plugins/gems in the future.
|
61
|
+
# def add_plugin_load_paths
|
62
|
+
# configuration.add_plugin_paths(extension_loader.paths(:plugin))
|
63
|
+
# super
|
64
|
+
# ActiveSupport::Dependencies.autoload_once_paths -= extension_loader.paths(:load)
|
65
|
+
# end
|
65
66
|
|
66
67
|
# Overrides the standard gem-loader to use Bundler instead of config.gem. This is the method normally monkey-patched
|
67
68
|
# into Rails::Initializer from boot.rb if you follow the instructions at http://gembundler.com/rails23.html
|
data/lib/trusty_cms/version.rb
CHANGED
@@ -24,7 +24,7 @@ end
|
|
24
24
|
module TrustyCms
|
25
25
|
class Application < Rails::Application
|
26
26
|
include TrustyCms::Initializer
|
27
|
-
|
27
|
+
config.legacy_connection_handling = false
|
28
28
|
config.autoload_paths += %W(#{TRUSTY_CMS_ROOT}/lib)
|
29
29
|
config.autoload_paths += %W(#{config.root}/lib)
|
30
30
|
config.autoload_paths += %W(#{config.root}/app/helpers)
|
@@ -110,7 +110,6 @@ module TrustyCms
|
|
110
110
|
|
111
111
|
# Make Active Record use UTC-base instead of local time
|
112
112
|
config.time_zone = 'UTC'
|
113
|
-
|
114
113
|
# Set the default field error proc
|
115
114
|
config.action_view.field_error_proc = Proc.new do |html, instance|
|
116
115
|
if html !~ /label/
|
@@ -120,7 +119,8 @@ module TrustyCms
|
|
120
119
|
end
|
121
120
|
end
|
122
121
|
|
123
|
-
config.
|
122
|
+
config.to_prepare do
|
123
|
+
extension_loader.deactivate_extensions
|
124
124
|
extension_loader.load_extensions
|
125
125
|
extension_loader.load_extension_initializers
|
126
126
|
|
data/trusty_cms.gemspec
CHANGED
@@ -28,9 +28,12 @@ a general purpose content management system--not merely a blogging engine.'
|
|
28
28
|
s.add_dependency 'activestorage-validator'
|
29
29
|
s.add_dependency 'acts_as_list', '>= 0.9.5', '< 1.3.0'
|
30
30
|
s.add_dependency 'acts_as_tree', '~> 2.9.1'
|
31
|
+
s.add_dependency 'base64'
|
32
|
+
s.add_dependency 'bigdecimal'
|
31
33
|
s.add_dependency 'ckeditor', '>= 4.2.2', '< 4.4.0'
|
32
34
|
s.add_dependency 'delocalize', '>= 0.2', '< 2.0'
|
33
35
|
s.add_dependency 'devise'
|
36
|
+
s.add_dependency 'drb'
|
34
37
|
s.add_dependency 'execjs', '~> 2.7'
|
35
38
|
s.add_dependency 'haml', '>= 5.0', '< 6.0'
|
36
39
|
s.add_dependency 'haml-rails'
|
@@ -38,11 +41,12 @@ a general purpose content management system--not merely a blogging engine.'
|
|
38
41
|
s.add_dependency 'image_processing'
|
39
42
|
s.add_dependency 'kraken-io'
|
40
43
|
s.add_dependency 'mini_racer'
|
44
|
+
s.add_dependency 'mutex_m'
|
41
45
|
s.add_dependency 'mysql2'
|
42
46
|
s.add_dependency 'rack', '>= 2.0.1', '< 3.1.0'
|
43
47
|
s.add_dependency 'rack-cache', '~> 1.7'
|
44
48
|
s.add_dependency 'radius', '~> 0.7'
|
45
|
-
s.add_dependency 'rails', '~>
|
49
|
+
s.add_dependency 'rails', '~> 7.0.0'
|
46
50
|
s.add_dependency 'rake', '< 14.0'
|
47
51
|
s.add_dependency 'ransack'
|
48
52
|
s.add_dependency 'rdoc', '>= 5.1', '< 7.0'
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: trusty-cms
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 7.0.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- TrustyCms CMS dev team
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2024-10-
|
11
|
+
date: 2024-10-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activestorage-validator
|
@@ -58,6 +58,34 @@ dependencies:
|
|
58
58
|
- - "~>"
|
59
59
|
- !ruby/object:Gem::Version
|
60
60
|
version: 2.9.1
|
61
|
+
- !ruby/object:Gem::Dependency
|
62
|
+
name: base64
|
63
|
+
requirement: !ruby/object:Gem::Requirement
|
64
|
+
requirements:
|
65
|
+
- - ">="
|
66
|
+
- !ruby/object:Gem::Version
|
67
|
+
version: '0'
|
68
|
+
type: :runtime
|
69
|
+
prerelease: false
|
70
|
+
version_requirements: !ruby/object:Gem::Requirement
|
71
|
+
requirements:
|
72
|
+
- - ">="
|
73
|
+
- !ruby/object:Gem::Version
|
74
|
+
version: '0'
|
75
|
+
- !ruby/object:Gem::Dependency
|
76
|
+
name: bigdecimal
|
77
|
+
requirement: !ruby/object:Gem::Requirement
|
78
|
+
requirements:
|
79
|
+
- - ">="
|
80
|
+
- !ruby/object:Gem::Version
|
81
|
+
version: '0'
|
82
|
+
type: :runtime
|
83
|
+
prerelease: false
|
84
|
+
version_requirements: !ruby/object:Gem::Requirement
|
85
|
+
requirements:
|
86
|
+
- - ">="
|
87
|
+
- !ruby/object:Gem::Version
|
88
|
+
version: '0'
|
61
89
|
- !ruby/object:Gem::Dependency
|
62
90
|
name: ckeditor
|
63
91
|
requirement: !ruby/object:Gem::Requirement
|
@@ -112,6 +140,20 @@ dependencies:
|
|
112
140
|
- - ">="
|
113
141
|
- !ruby/object:Gem::Version
|
114
142
|
version: '0'
|
143
|
+
- !ruby/object:Gem::Dependency
|
144
|
+
name: drb
|
145
|
+
requirement: !ruby/object:Gem::Requirement
|
146
|
+
requirements:
|
147
|
+
- - ">="
|
148
|
+
- !ruby/object:Gem::Version
|
149
|
+
version: '0'
|
150
|
+
type: :runtime
|
151
|
+
prerelease: false
|
152
|
+
version_requirements: !ruby/object:Gem::Requirement
|
153
|
+
requirements:
|
154
|
+
- - ">="
|
155
|
+
- !ruby/object:Gem::Version
|
156
|
+
version: '0'
|
115
157
|
- !ruby/object:Gem::Dependency
|
116
158
|
name: execjs
|
117
159
|
requirement: !ruby/object:Gem::Requirement
|
@@ -222,6 +264,20 @@ dependencies:
|
|
222
264
|
- - ">="
|
223
265
|
- !ruby/object:Gem::Version
|
224
266
|
version: '0'
|
267
|
+
- !ruby/object:Gem::Dependency
|
268
|
+
name: mutex_m
|
269
|
+
requirement: !ruby/object:Gem::Requirement
|
270
|
+
requirements:
|
271
|
+
- - ">="
|
272
|
+
- !ruby/object:Gem::Version
|
273
|
+
version: '0'
|
274
|
+
type: :runtime
|
275
|
+
prerelease: false
|
276
|
+
version_requirements: !ruby/object:Gem::Requirement
|
277
|
+
requirements:
|
278
|
+
- - ">="
|
279
|
+
- !ruby/object:Gem::Version
|
280
|
+
version: '0'
|
225
281
|
- !ruby/object:Gem::Dependency
|
226
282
|
name: mysql2
|
227
283
|
requirement: !ruby/object:Gem::Requirement
|
@@ -290,14 +346,14 @@ dependencies:
|
|
290
346
|
requirements:
|
291
347
|
- - "~>"
|
292
348
|
- !ruby/object:Gem::Version
|
293
|
-
version:
|
349
|
+
version: 7.0.0
|
294
350
|
type: :runtime
|
295
351
|
prerelease: false
|
296
352
|
version_requirements: !ruby/object:Gem::Requirement
|
297
353
|
requirements:
|
298
354
|
- - "~>"
|
299
355
|
- !ruby/object:Gem::Version
|
300
|
-
version:
|
356
|
+
version: 7.0.0
|
301
357
|
- !ruby/object:Gem::Dependency
|
302
358
|
name: rake
|
303
359
|
requirement: !ruby/object:Gem::Requirement
|