update merged (pushes)

This commit is contained in:
Torsten 2023-10-21 22:36:35 +03:00
parent f557c58deb
commit f21c01eb14
2 changed files with 12 additions and 17 deletions

View File

@ -5,7 +5,7 @@ ruby "3.1.3"
gem "merged" , git: "https://github.com/HubFeenixMakers/merged" gem "merged" , git: "https://github.com/HubFeenixMakers/merged"
#gem "merged" , path: "../merged" #gem "merged" , path: "../merged"
gem "rails", "~> 7.0" gem "rails", "~> 7.0.0"
gem "sprockets-rails" gem "sprockets-rails"

View File

@ -1,10 +1,9 @@
GIT GIT
remote: https://github.com/HubFeenixMakers/merged remote: https://github.com/HubFeenixMakers/merged
revision: a28ca85a371a89c0934d3d5e33b64e8270d15bfe revision: 2d5f8d972a69081444379a110e9fd6302dca6431
specs: specs:
merged (0.1.0) merged (0.1.0)
active_hash active_hash
git
haml-rails haml-rails
mini_magick mini_magick
rails (>= 7.0.4) rails (>= 7.0.4)
@ -68,7 +67,7 @@ GEM
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0)
active_hash (3.2.0) active_hash (3.2.1)
activesupport (>= 5.0.0) activesupport (>= 5.0.0)
active_record_union (1.3.0) active_record_union (1.3.0)
activerecord (>= 4.0) activerecord (>= 4.0)
@ -147,9 +146,6 @@ GEM
formatador (1.1.0) formatador (1.1.0)
friendly_id (5.5.0) friendly_id (5.5.0)
activerecord (>= 4.0.0) activerecord (>= 4.0.0)
git (1.18.0)
addressable (~> 2.8)
rchardet (~> 1.8)
globalid (1.2.1) globalid (1.2.1)
activesupport (>= 6.1) activesupport (>= 6.1)
guard (2.18.0) guard (2.18.0)
@ -165,7 +161,7 @@ GEM
guard-minitest (2.4.6) guard-minitest (2.4.6)
guard-compat (~> 1.2) guard-compat (~> 1.2)
minitest (>= 3.0) minitest (>= 3.0)
haml (6.1.2) haml (6.2.3)
temple (>= 0.8.2) temple (>= 0.8.2)
thor thor
tilt tilt
@ -218,7 +214,7 @@ GEM
listen (3.7.1) listen (3.7.1)
rb-fsevent (~> 0.10, >= 0.10.3) rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10) rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.21.3) loofah (2.21.4)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.12.0) nokogiri (>= 1.12.0)
lumberjack (1.2.8) lumberjack (1.2.8)
@ -240,14 +236,14 @@ GEM
multi_json (1.15.0) multi_json (1.15.0)
mustache (1.1.1) mustache (1.1.1)
nenv (0.3.0) nenv (0.3.0)
net-imap (0.3.7) net-imap (0.4.2)
date date
net-protocol net-protocol
net-pop (0.1.2) net-pop (0.1.2)
net-protocol net-protocol
net-protocol (0.2.1) net-protocol (0.2.1)
timeout timeout
net-smtp (0.3.3) net-smtp (0.4.0)
net-protocol net-protocol
nio4r (2.5.9) nio4r (2.5.9)
nokogiri (1.15.4-x86_64-linux) nokogiri (1.15.4-x86_64-linux)
@ -264,7 +260,7 @@ GEM
sanitize sanitize
open4 (1.3.4) open4 (1.3.4)
orm_adapter (0.5.0) orm_adapter (0.5.0)
parser (3.2.2.3) parser (3.2.2.4)
ast (~> 2.4.1) ast (~> 2.4.1)
racc racc
passenger (6.0.15) passenger (6.0.15)
@ -319,7 +315,6 @@ GEM
rb-fsevent (0.11.2) rb-fsevent (0.11.2)
rb-inotify (0.10.1) rb-inotify (0.10.1)
ffi (~> 1.0) ffi (~> 1.0)
rchardet (1.8.0)
redcarpet (3.6.0) redcarpet (3.6.0)
regexp_parser (2.1.1) regexp_parser (2.1.1)
reline (0.3.2) reline (0.3.2)
@ -373,8 +368,8 @@ GEM
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
tailwindcss-rails (2.0.21-x86_64-linux) tailwindcss-rails (2.0.21-x86_64-linux)
railties (>= 6.0.0) railties (>= 6.0.0)
temple (0.10.2) temple (0.10.3)
thor (1.2.2) thor (1.3.0)
thredded (1.0.1) thredded (1.0.1)
active_record_union (>= 1.3.0) active_record_union (>= 1.3.0)
autoprefixer-rails autoprefixer-rails
@ -418,7 +413,7 @@ GEM
websocket-extensions (0.1.5) websocket-extensions (0.1.5)
xpath (3.2.0) xpath (3.2.0)
nokogiri (~> 1.8) nokogiri (~> 1.8)
zeitwerk (2.6.11) zeitwerk (2.6.12)
PLATFORMS PLATFORMS
x86_64-linux x86_64-linux
@ -441,7 +436,7 @@ DEPENDENCIES
passenger (= 6.0.15) passenger (= 6.0.15)
pg (~> 1.1) pg (~> 1.1)
pundit (~> 2.3) pundit (~> 2.3)
rails (~> 7.0) rails (~> 7.0.0)
ransack ransack
ruby2js! ruby2js!
sassc-rails sassc-rails