Upgrade 29.4 (#111)

* remove unnecessary override

* version

* version

* fix specs

Author: microstudi

Gemfile.lock

@@ -19,7 +19,6 @@ class Engine < ::Rails::Engine
         Decidim::FormBuilder.include(Decidim::ReportingProposals::FormBuilderOverride)
         Decidim::ResourceHelper.include(Decidim::ReportingProposals::ResourceHelperOverride)
         Decidim::Map::Autocomplete::Builder.include(Decidim::ReportingProposals::MapBuilderOverride)
-        Decidim::CreateReport.include(Decidim::ReportingProposals::CreateReportOverride)
         Decidim::LinkedResourcesForCell.include(Decidim::ReportingProposals::LinkedResourcesForCellOverride)
         Decidim::Proposals::ProposalSerializer.include(Decidim::ReportingProposals::ProposalSerializerOverride)
         Decidim::Proposals::ProposalsPickerCell.include(Decidim::ReportingProposals::ProposalsPickerCellOverride)

app/commands/concerns/decidim/reporting_proposals/create_report_override.rb

@@ -2,8 +2,8 @@
 
 module Decidim
   module ReportingProposals
-    VERSION = "0.7.1"
-    DECIDIM_VERSION = "0.29.3"
+    VERSION = "0.7.2"
+    DECIDIM_VERSION = "0.29.4"
     COMPAT_DECIDIM_VERSION = [">= 0.29.3", "< 0.30"].freeze
   end
 end

app/overrides/layouts/decidim/_process_header_steps/always_show_new_proposals.html.erb.deface

@@ -13,11 +13,10 @@
       "/lib/decidim/map/autocomplete.rb" => "c9249996707cb63d9b44f22a3441e1c5",
       "/lib/decidim/form_builder.rb" => "f8c91d2c47acef53aa4680eb72280703",
       "/app/helpers/decidim/resource_helper.rb" => "6e5c33c68581bbfabcf5bdd489d65a25",
-      "/app/commands/decidim/create_report.rb" => "b4481e9ca946dd56c3a1849e9bf1c9b4",
       "/app/commands/decidim/gallery_methods.rb" => "9a33f44912059c9764691abb03f70a84",
       "/app/models/decidim/category.rb" => "fc044f23d00373d62693ee7f044558fe",
       "/app/models/decidim/participatory_space_role_config/valuator.rb" => "8dbcc7c787a7db6e9cdebccf888ffbdf",
-      "/app/mailers/decidim/reported_mailer.rb" => "45d4eb8d98dfb5b094150e3b0dcc2ec4",
+      "/app/mailers/decidim/reported_mailer.rb" => "71d62556c29e7edb52cf09ad4da28cf1",
       "/app/presenters/decidim/resource_locator_presenter.rb" => "84a195ea879885bd7fa78dfa51ee7f12",
       "/app/cells/decidim/linked_resources_for_cell.rb" => "7559a251620f5ca336c175a8d8ceabdc"
     }
@@ -52,8 +51,10 @@
       "/app/commands/decidim/proposals/publish_proposal.rb" => "30c6c7e5504394e0a69a9776cc319b57",
       "/app/commands/decidim/proposals/admin/answer_proposal.rb" => "04a1391daacc5f82eaffd675fde73b8f",
       "/app/forms/decidim/proposals/proposal_form.rb" => "0b19bfeb4f7bd15cd378a69c3935de6b",
+      "/app/views/decidim/proposals/proposals/preview.html.erb" => "d75bdc32e4042be3753be3dfd4bb7fce",
       "/app/views/decidim/proposals/proposals/new.html.erb" => "ba8c88bdf07061fda1962c54868c9131",
       "/app/views/decidim/proposals/proposals/edit.html.erb" => "6d34fd034334d83c60632cf478530d98",
+      "/app/views/decidim/proposals/proposals/index.html.erb" => "e7a4c4d9f000d17c68ae9eeddde69094",
       "/app/views/decidim/proposals/proposals/edit_draft.html.erb" => "3e51c7a14d250a1abef0753a1db7661b",
       "/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb" => "5907a92b0adf9a0cd5f1e5241317cd48",
       "/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb" => "057ee4242479109023a5904c8de55222",

lib/decidim/reporting_proposals/engine.rb

@@ -141,7 +141,7 @@ module Decidim
     end
 
     describe "#hide" do
-      let(:mail) { described_class.hide(user, report) }
+      let(:mail) { described_class.hidden_automatically(user, report) }
 
       let(:mail_subject) { "Un contingut s'ha ocultat automàticament" }
       let(:default_subject) { "A resource has been hidden automatically" }