FeenixMakers/hubfeenix.fi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Torsten 2023-01-29 16:41:41 +02:00
parent b498b253f7
commit a14c028f61
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile.lock
View File

@ -1,6 +1,6 @@
GIT GIT
remote: https://github.com/HubFeenixMakers/merged remote: https://github.com/HubFeenixMakers/merged
revision: 3a15e58ee38dae847ff877c261ce9856e00c74fb revision: ee94e687f93cd317df6829e7ce2393b3451044b5
specs: specs:
merged (0.1.0) merged (0.1.0)
active_hash active_hash
@ -319,7 +319,7 @@ GEM
rb-inotify (0.10.1) rb-inotify (0.10.1)
ffi (~> 1.0) ffi (~> 1.0)
rchardet (1.8.0) rchardet (1.8.0)
redcarpet (3.5.1) redcarpet (3.6.0)
regexp_parser (2.1.1) regexp_parser (2.1.1)
reline (0.3.2) reline (0.3.2)
io-console (~> 0.5) io-console (~> 0.5)
@ -401,7 +401,7 @@ GEM
tilt (2.0.11) tilt (2.0.11)
timeago_js (3.0.2.2) timeago_js (3.0.2.2)
timeout (0.3.1) timeout (0.3.1)
tzinfo (2.0.5) tzinfo (2.0.6)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
unf (0.1.4) unf (0.1.4)
unf_ext unf_ext

4
config/initializers/merged.rb
View File

@ -1,8 +1,6 @@
require "merged" require "merged"
# directory inside /app/assets/images where YOUR images are kept # directory inside /app/assets/images where the images are kept
# if you change this and add own styles, you will still need a merged directory
# for the previews (card_preview and section_preview)
Merged.images_dir = "merged" Merged.images_dir = "merged"
# directory where data and styles are kept # directory where data and styles are kept