use git merged
This commit is contained in:
parent
45f59f174b
commit
81a475a991
4
Gemfile
4
Gemfile
@ -24,8 +24,8 @@ gem "rest-client"
|
||||
gem "simple_form" , "5.1.0"
|
||||
gem "simple_form_tailwind_css"
|
||||
|
||||
#gem "merged" , git: "https://github.com/HubFeenixMakers/merged"
|
||||
gem "merged" , path: "../merged"
|
||||
gem "merged" , git: "https://github.com/HubFeenixMakers/merged"
|
||||
#gem "merged" , path: "../merged"
|
||||
|
||||
gem "passenger" , require: "phusion_passenger/rack_handler"
|
||||
gem "bootsnap", require: false
|
||||
|
21
Gemfile.lock
21
Gemfile.lock
@ -1,14 +1,6 @@
|
||||
GIT
|
||||
remote: https://github.com/ruby2js/ruby2js/
|
||||
revision: f204f4e8f14cde6e4d4c6aafc55251a8d488a78d
|
||||
branch: haml_fix
|
||||
specs:
|
||||
ruby2js (5.0.1)
|
||||
parser
|
||||
regexp_parser (~> 2.1.1)
|
||||
|
||||
PATH
|
||||
remote: ../merged
|
||||
remote: https://github.com/HubFeenixMakers/merged
|
||||
revision: c58b5fc4ba4ef138dcf7dd50592bdebac378cbda
|
||||
specs:
|
||||
merged (0.1.0)
|
||||
active_hash
|
||||
@ -19,6 +11,15 @@ PATH
|
||||
redcarpet
|
||||
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
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
|
Loading…
Reference in New Issue
Block a user