FeenixMakers/residency
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git merged

Browse Source
This commit is contained in:
Torsten 2023-01-16 22:30:12 +02:00
parent dbff351547
commit fb9be2fe7a
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -23,8 +23,8 @@ gem "simple_form" , "5.1.0"
gem "simple_form_tailwind_css" gem "simple_form_tailwind_css"
gem 'kaminari' gem 'kaminari'
#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 "passenger" , require: "phusion_passenger/rack_handler" gem "passenger" , require: "phusion_passenger/rack_handler"

21
Gemfile.lock
View File

@ -1,14 +1,6 @@
GIT GIT
remote: https://github.com/ruby2js/ruby2js/ remote: https://github.com/HubFeenixMakers/merged
revision: f204f4e8f14cde6e4d4c6aafc55251a8d488a78d revision: c58b5fc4ba4ef138dcf7dd50592bdebac378cbda
branch: haml_fix
specs:
ruby2js (5.0.1)
parser
regexp_parser (~> 2.1.1)
PATH
remote: ../merged
specs: specs:
merged (0.1.0) merged (0.1.0)
active_hash active_hash
@ -19,6 +11,15 @@ PATH
redcarpet redcarpet
ruby2js (~> 5.0, >= 5.0.1) ruby2js (~> 5.0, >= 5.0.1)
GIT
remote: https://github.com/ruby2js/ruby2js/
revision: f204f4e8f14cde6e4d4c6aafc55251a8d488a78d
branch: haml_fix
specs:
ruby2js (5.0.1)
parser
regexp_parser (~> 2.1.1)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs: