diff --git a/Gemfile b/Gemfile index 4cccf15..d07bcc5 100644 --- a/Gemfile +++ b/Gemfile @@ -19,8 +19,8 @@ gem "sassc-rails" gem "haml-rails", "~> 2.0" gem 'html2haml' -gem "merged" , git: "https://github.com/FeenixMakers/merged" -#gem "merged" , path: "../merged" +#gem "merged" , git: "https://github.com/FeenixMakers/merged" +gem "merged" , path: "../merged" # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images] # gem "image_processing", "~> 1.2" diff --git a/Gemfile.lock b/Gemfile.lock index 36b639d..5252fde 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,5 @@ -GIT - remote: https://github.com/FeenixMakers/merged - revision: 60808aee26454387264ac148deb7017952bc841c +PATH + remote: ../merged specs: merged (0.1.0) active_hash diff --git a/merged/images.yml b/merged/images.yml new file mode 100644 index 0000000..dcd024e --- /dev/null +++ b/merged/images.yml @@ -0,0 +1 @@ +--- [] diff --git a/merged/pages.yml b/merged/pages.yml index dcd024e..56a10e8 100644 --- a/merged/pages.yml +++ b/merged/pages.yml @@ -1 +1,6 @@ ---- [] +--- +- :name: index + :updated_at: 2023-10-23 20:18:09.313967169 +03:00 + :type: page + :updated_by: merged_user + :id: 1 diff --git a/merged/sections.yml b/merged/sections.yml index dcd024e..58cecb2 100644 --- a/merged/sections.yml +++ b/merged/sections.yml @@ -1 +1,10 @@ ---- [] +--- +- :template: section_full_up + :index: 1 + :page_id: 1 + :updated_at: 2023-10-23 20:21:11.289811920 +03:00 + :updated_by: merged_user + :id: 1 + :card_template: '' + :header: Here it starts + :text: with text