FeenixMakers/wonder-of-life
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switched back to git merged

Browse Source
This commit is contained in:
Torsten 2023-10-23 22:42:15 +03:00
parent f0ad59e47c
commit 1f5f52bd52
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -19,8 +19,8 @@ gem "sassc-rails"
gem "haml-rails", "~> 2.0" gem "haml-rails", "~> 2.0"
gem 'html2haml' gem 'html2haml'
#gem "merged" , git: "https://github.com/FeenixMakers/merged" gem "merged" , git: "https://github.com/FeenixMakers/merged"
gem "merged" , path: "../merged" #gem "merged" , path: "../merged"
# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images] # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
# gem "image_processing", "~> 1.2" # gem "image_processing", "~> 1.2"

5
Gemfile.lock
View File

@ -1,5 +1,6 @@
PATH GIT
remote: ../merged remote: https://github.com/FeenixMakers/merged
revision: fc79c65b54a7703d162a97fb15a25de3c572c2a9
specs: specs:
merged (0.1.0) merged (0.1.0)
active_hash active_hash