Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/i18n.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
SIMPLECOV: 0
CODECOV: 0

- uses: actions/upload-artifact@v2-preview
- uses: actions/upload-artifact@v4
if: always()
with:
name: screenshots
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
SIMPLECOV: 1
CODECOV: 1

- uses: actions/upload-artifact@v2-preview
- uses: actions/upload-artifact@v4
if: always()
with:
name: screenshots
Expand Down
1 change: 0 additions & 1 deletion decidim-gallery.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ Gem::Specification.new do |s|

s.add_dependency "decidim-admin", ">= 0.26.0", "< 0.28.0"
s.add_dependency "decidim-core", ">= 0.26.0", "< 0.28.0"
s.add_dependency "deface", "~> 1.9"
s.add_development_dependency "decidim-participatory_processes", ">= 0.26.0", "< 0.28.0"
s.metadata["rubygems_mfa_required"] = "true"
end
1 change: 0 additions & 1 deletion lib/decidim/gallery.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# frozen_string_literal: true

require "deface"
require "decidim/gallery/admin"
require "decidim/gallery/engine"
require "decidim/gallery/admin_engine"
Expand Down
15 changes: 9 additions & 6 deletions lib/decidim/gallery/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ class Engine < ::Rails::Engine
root to: "gallery#index"
end

initializer "decidim_gallery.deface" do
Rails.application.configure do
config.deface.enabled = true
end
end
# initializer "decidim_gallery.deface" do
# Rails.application.configure do
# config.deface.enabled = true
# end
# end

initializer "decidim_gallery.webpacker.assets_path" do
Decidim.register_assets_path File.expand_path("app/packs", root)
Expand All @@ -33,12 +33,15 @@ class Engine < ::Rails::Engine
initializer "decidim_gallery.action_controller" do
Rails.application.reloader.to_prepare do
ActiveSupport.on_load :action_controller do
::Decidim::Admin::StaticPagesController.helper Decidim::Gallery::Admin::ApplicationHelper
::Decidim::Admin::StaticPageForm.prepend Decidim::Gallery::Admin::StaticPages::Form
::Decidim::Admin::CreateStaticPage.prepend Decidim::Gallery::Admin::StaticPages::Command
::Decidim::Admin::UpdateStaticPage.prepend Decidim::Gallery::Admin::StaticPages::Command
end
end

config.after_initialize do
::Decidim::Admin::StaticPagesController.helper Decidim::Gallery::Admin::ApplicationHelper
end
end

initializer "decidim_gallery.register_blocks" do
Expand Down
Loading