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

leave merged local for now

Browse Source
This commit is contained in:
Torsten 2023-01-08 23:51:34 +02:00
parent 19db53d98c
commit e36719c4f6
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -22,8 +22,8 @@ gem 'thredded', '~> 1.0'
gem "simple_form" , "5.1.0" gem "simple_form" , "5.1.0"
gem "simple_form_tailwind_css" gem "simple_form_tailwind_css"
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,6 +1,14 @@
GIT GIT
remote: https://github.com/HubFeenixMakers/merged remote: https://github.com/ruby2js/ruby2js/
revision: 178c0ba9d207acac46d799379926bf44307545f9 revision: f204f4e8f14cde6e4d4c6aafc55251a8d488a78d
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
@ -11,15 +19,6 @@ GIT
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: