diff --git a/Gemfile b/Gemfile index 594928b4..285f5b8e 100644 --- a/Gemfile +++ b/Gemfile @@ -16,6 +16,7 @@ gem "decidim-templates", "~> #{DECIDIM_VERSION}.0" # External Decidim gems gem "decidim-cache_cleaner" +gem "decidim-simple_proposal", git: "https://github.com/mainio/decidim-module-simple_proposal", branch: DECIDIM_BRANCH gem "decidim-decidim_awesome" gem "decidim-friendly_signup", git: "https://github.com/OpenSourcePolitics/decidim-module-friendly_signup.git" gem "decidim-phone_authorization_handler", git: "https://github.com/OpenSourcePolitics/decidim-module_phone_authorization_handler", branch: DECIDIM_BRANCH diff --git a/Gemfile.lock b/Gemfile.lock index 8d0b268e..03c6883c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,6 +37,15 @@ GIT decidim-admin (~> 0.26.0) decidim-core (~> 0.26.0) +GIT + remote: https://github.com/mainio/decidim-module-simple_proposal + revision: b91e238151ec818896bb77d296313406adce7880 + branch: release/0.26-stable + specs: + decidim-simple_proposal (0.26.0) + decidim-core (~> 0.26.0) + decidim-proposals (~> 0.26.0) + GIT remote: https://github.com/sgruhier/foundation_rails_helper.git revision: bc33600db7a2d16ce3cdc1f8369d0d7e7c4245b5 @@ -322,9 +331,9 @@ GEM decidim-debates (0.26.7) decidim-comments (= 0.26.7) decidim-core (= 0.26.7) - decidim-decidim_awesome (0.8.3) - decidim-admin (>= 0.25.0, < 0.27) - decidim-core (>= 0.25.0, < 0.27) + decidim-decidim_awesome (0.9.3) + decidim-admin (>= 0.26.0, < 0.28) + decidim-core (>= 0.26.0, < 0.28) sassc (~> 2.3) decidim-dev (0.26.7) axe-core-rspec (~> 4.1.0) @@ -569,7 +578,6 @@ GEM mime-types-data (3.2022.0105) mini_magick (4.11.0) mini_mime (1.1.2) - mini_portile2 (2.8.0) minitest (5.16.3) mixlib-cli (2.1.8) mixlib-config (3.0.27) @@ -581,8 +589,7 @@ GEM multi_xml (0.6.0) mustache (1.1.1) nio4r (2.5.8) - nokogiri (1.13.4) - mini_portile2 (~> 2.8.0) + nokogiri (1.13.4-arm64-darwin) racc (~> 1.4) nokogiri (1.13.4-x86_64-darwin) racc (~> 1.4) @@ -930,7 +937,7 @@ GEM zeitwerk (2.6.0) PLATFORMS - ruby + arm64-darwin-21 x86_64-darwin-21 x86_64-linux @@ -948,6 +955,7 @@ DEPENDENCIES decidim-dev (~> 0.26.0) decidim-friendly_signup! decidim-phone_authorization_handler! + decidim-simple_proposal! decidim-spam_detection decidim-templates (~> 0.26.0) decidim-term_customizer! @@ -983,4 +991,4 @@ RUBY VERSION ruby 2.7.5p203 BUNDLED WITH - 2.4.6 + 2.4.9 diff --git a/db/migrate/20231027164305_add_deleted_at_to_proposals.decidim_simple_proposal.rb b/db/migrate/20231027164305_add_deleted_at_to_proposals.decidim_simple_proposal.rb new file mode 100644 index 00000000..17a9f462 --- /dev/null +++ b/db/migrate/20231027164305_add_deleted_at_to_proposals.decidim_simple_proposal.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true +# This migration comes from decidim_simple_proposal (originally 20220318112320) + +class AddDeletedAtToProposals < ActiveRecord::Migration[6.0] + def change + add_column :decidim_proposals_proposals, :deleted_at, :datetime, index: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 76a78a74..3a8b8716 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2022_08_18_155742) do +ActiveRecord::Schema.define(version: 2023_10_27_164305) do # These are extensions that must be enabled in order to support this database enable_extension "ltree" @@ -1284,6 +1284,7 @@ t.jsonb "body" t.integer "comments_count", default: 0, null: false t.integer "follows_count", default: 0, null: false + t.datetime "deleted_at" t.index "md5((body)::text)", name: "decidim_proposals_proposal_body_search" t.index "md5((title)::text)", name: "decidim_proposals_proposal_title_search" t.index ["created_at"], name: "index_decidim_proposals_proposals_on_created_at"