update merged (which puled rails)
This commit is contained in:
parent
27e6d08e73
commit
069cdf15be
112
Gemfile.lock
112
Gemfile.lock
@ -1,6 +1,6 @@
|
|||||||
GIT
|
GIT
|
||||||
remote: https://github.com/HubFeenixMakers/merged
|
remote: https://github.com/HubFeenixMakers/merged
|
||||||
revision: b7251ef1355b6a00f3816eb9f6184f42c892867b
|
revision: 2974b43bde2391a9c8c115ba1cf72555ca94f35a
|
||||||
specs:
|
specs:
|
||||||
merged (0.1.0)
|
merged (0.1.0)
|
||||||
active_hash
|
active_hash
|
||||||
@ -23,47 +23,47 @@ GIT
|
|||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actioncable (7.0.4)
|
actioncable (7.0.4.1)
|
||||||
actionpack (= 7.0.4)
|
actionpack (= 7.0.4.1)
|
||||||
activesupport (= 7.0.4)
|
activesupport (= 7.0.4.1)
|
||||||
nio4r (~> 2.0)
|
nio4r (~> 2.0)
|
||||||
websocket-driver (>= 0.6.1)
|
websocket-driver (>= 0.6.1)
|
||||||
actionmailbox (7.0.4)
|
actionmailbox (7.0.4.1)
|
||||||
actionpack (= 7.0.4)
|
actionpack (= 7.0.4.1)
|
||||||
activejob (= 7.0.4)
|
activejob (= 7.0.4.1)
|
||||||
activerecord (= 7.0.4)
|
activerecord (= 7.0.4.1)
|
||||||
activestorage (= 7.0.4)
|
activestorage (= 7.0.4.1)
|
||||||
activesupport (= 7.0.4)
|
activesupport (= 7.0.4.1)
|
||||||
mail (>= 2.7.1)
|
mail (>= 2.7.1)
|
||||||
net-imap
|
net-imap
|
||||||
net-pop
|
net-pop
|
||||||
net-smtp
|
net-smtp
|
||||||
actionmailer (7.0.4)
|
actionmailer (7.0.4.1)
|
||||||
actionpack (= 7.0.4)
|
actionpack (= 7.0.4.1)
|
||||||
actionview (= 7.0.4)
|
actionview (= 7.0.4.1)
|
||||||
activejob (= 7.0.4)
|
activejob (= 7.0.4.1)
|
||||||
activesupport (= 7.0.4)
|
activesupport (= 7.0.4.1)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
net-imap
|
net-imap
|
||||||
net-pop
|
net-pop
|
||||||
net-smtp
|
net-smtp
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
actionpack (7.0.4)
|
actionpack (7.0.4.1)
|
||||||
actionview (= 7.0.4)
|
actionview (= 7.0.4.1)
|
||||||
activesupport (= 7.0.4)
|
activesupport (= 7.0.4.1)
|
||||||
rack (~> 2.0, >= 2.2.0)
|
rack (~> 2.0, >= 2.2.0)
|
||||||
rack-test (>= 0.6.3)
|
rack-test (>= 0.6.3)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
||||||
actiontext (7.0.4)
|
actiontext (7.0.4.1)
|
||||||
actionpack (= 7.0.4)
|
actionpack (= 7.0.4.1)
|
||||||
activerecord (= 7.0.4)
|
activerecord (= 7.0.4.1)
|
||||||
activestorage (= 7.0.4)
|
activestorage (= 7.0.4.1)
|
||||||
activesupport (= 7.0.4)
|
activesupport (= 7.0.4.1)
|
||||||
globalid (>= 0.6.0)
|
globalid (>= 0.6.0)
|
||||||
nokogiri (>= 1.8.5)
|
nokogiri (>= 1.8.5)
|
||||||
actionview (7.0.4)
|
actionview (7.0.4.1)
|
||||||
activesupport (= 7.0.4)
|
activesupport (= 7.0.4.1)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubi (~> 1.4)
|
erubi (~> 1.4)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
@ -72,22 +72,22 @@ GEM
|
|||||||
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)
|
||||||
activejob (7.0.4)
|
activejob (7.0.4.1)
|
||||||
activesupport (= 7.0.4)
|
activesupport (= 7.0.4.1)
|
||||||
globalid (>= 0.3.6)
|
globalid (>= 0.3.6)
|
||||||
activemodel (7.0.4)
|
activemodel (7.0.4.1)
|
||||||
activesupport (= 7.0.4)
|
activesupport (= 7.0.4.1)
|
||||||
activerecord (7.0.4)
|
activerecord (7.0.4.1)
|
||||||
activemodel (= 7.0.4)
|
activemodel (= 7.0.4.1)
|
||||||
activesupport (= 7.0.4)
|
activesupport (= 7.0.4.1)
|
||||||
activestorage (7.0.4)
|
activestorage (7.0.4.1)
|
||||||
actionpack (= 7.0.4)
|
actionpack (= 7.0.4.1)
|
||||||
activejob (= 7.0.4)
|
activejob (= 7.0.4.1)
|
||||||
activerecord (= 7.0.4)
|
activerecord (= 7.0.4.1)
|
||||||
activesupport (= 7.0.4)
|
activesupport (= 7.0.4.1)
|
||||||
marcel (~> 1.0)
|
marcel (~> 1.0)
|
||||||
mini_mime (>= 1.1.0)
|
mini_mime (>= 1.1.0)
|
||||||
activesupport (7.0.4)
|
activesupport (7.0.4.1)
|
||||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||||
i18n (>= 1.6, < 2)
|
i18n (>= 1.6, < 2)
|
||||||
minitest (>= 5.1)
|
minitest (>= 5.1)
|
||||||
@ -147,7 +147,7 @@ GEM
|
|||||||
git (1.13.1)
|
git (1.13.1)
|
||||||
addressable (~> 2.8)
|
addressable (~> 2.8)
|
||||||
rchardet (~> 1.8)
|
rchardet (~> 1.8)
|
||||||
globalid (1.0.0)
|
globalid (1.0.1)
|
||||||
activesupport (>= 5.0)
|
activesupport (>= 5.0)
|
||||||
guard (2.18.0)
|
guard (2.18.0)
|
||||||
formatador (>= 0.2.4)
|
formatador (>= 0.2.4)
|
||||||
@ -274,23 +274,23 @@ GEM
|
|||||||
pundit (2.3.0)
|
pundit (2.3.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
racc (1.6.2)
|
racc (1.6.2)
|
||||||
rack (2.2.5)
|
rack (2.2.6.2)
|
||||||
rack-test (2.0.2)
|
rack-test (2.0.2)
|
||||||
rack (>= 1.3)
|
rack (>= 1.3)
|
||||||
rails (7.0.4)
|
rails (7.0.4.1)
|
||||||
actioncable (= 7.0.4)
|
actioncable (= 7.0.4.1)
|
||||||
actionmailbox (= 7.0.4)
|
actionmailbox (= 7.0.4.1)
|
||||||
actionmailer (= 7.0.4)
|
actionmailer (= 7.0.4.1)
|
||||||
actionpack (= 7.0.4)
|
actionpack (= 7.0.4.1)
|
||||||
actiontext (= 7.0.4)
|
actiontext (= 7.0.4.1)
|
||||||
actionview (= 7.0.4)
|
actionview (= 7.0.4.1)
|
||||||
activejob (= 7.0.4)
|
activejob (= 7.0.4.1)
|
||||||
activemodel (= 7.0.4)
|
activemodel (= 7.0.4.1)
|
||||||
activerecord (= 7.0.4)
|
activerecord (= 7.0.4.1)
|
||||||
activestorage (= 7.0.4)
|
activestorage (= 7.0.4.1)
|
||||||
activesupport (= 7.0.4)
|
activesupport (= 7.0.4.1)
|
||||||
bundler (>= 1.15.0)
|
bundler (>= 1.15.0)
|
||||||
railties (= 7.0.4)
|
railties (= 7.0.4.1)
|
||||||
rails-dom-testing (2.0.3)
|
rails-dom-testing (2.0.3)
|
||||||
activesupport (>= 4.2.0)
|
activesupport (>= 4.2.0)
|
||||||
nokogiri (>= 1.6)
|
nokogiri (>= 1.6)
|
||||||
@ -298,9 +298,9 @@ GEM
|
|||||||
loofah (~> 2.19, >= 2.19.1)
|
loofah (~> 2.19, >= 2.19.1)
|
||||||
rails_gravatar (1.0.4)
|
rails_gravatar (1.0.4)
|
||||||
actionview
|
actionview
|
||||||
railties (7.0.4)
|
railties (7.0.4.1)
|
||||||
actionpack (= 7.0.4)
|
actionpack (= 7.0.4.1)
|
||||||
activesupport (= 7.0.4)
|
activesupport (= 7.0.4.1)
|
||||||
method_source
|
method_source
|
||||||
rake (>= 12.2)
|
rake (>= 12.2)
|
||||||
thor (~> 1.0)
|
thor (~> 1.0)
|
||||||
|
Loading…
Reference in New Issue
Block a user