decidim-core 0.28.5 → 0.29.0.rc1

data/lib/tasks/decidim_webpacker_tasks.rake

@@ -12,12 +12,13 @@ namespace :decidim do
       remove_file_from_application "bin/yarn"
       remove_file_from_application "yarn.lock"
       remove_file_from_application "node_modules/.yarn-integrity"
-      # Babel config
-      copy_file_to_application "babel.config.json"
       # PostCSS configuration
       copy_file_to_application "decidim-core/lib/decidim/webpacker/postcss.config.js", "postcss.config.js"
 
-      # Remnove the Webpacker config and deploy shakacpacker
+      copy_file_to_application "decidim-core/lib/decidim/webpacker/esbuild.config.js", "config/esbuild.config.js"
+      copy_file_to_application "decidim-core/lib/decidim/webpacker/tsconfig.json", "tsconfig.json"
+
+      # Remove the Webpacker config and deploy shakapacker
       migrate_shakapacker
 
       # Install JS dependencies
@@ -49,162 +50,173 @@ namespace :decidim do
       # Add the Browserslist configuration to the project
       add_decidim_browserslist_configuration
     end
+  end
 
-    desc "Upgrade Decidim dependencies in Rails instance application"
-    task upgrade: :environment do
+  namespace :upgrade do
+    desc "Upgrades Decidim webpacker dependencies in Rails instance application"
+    task webpacker: :environment do
       raise "Decidim gem is not installed" if decidim_path.nil?
 
       remove_file_from_application "bin/yarn"
 
-      # Remnove the Webpacker config and deploy shakacpacker
+      unless File.exist?(rails_app_path.join("config/esbuild.config.js"))
+        copy_file_to_application "decidim-core/lib/decidim/webpacker/esbuild.config.js",
+                                 "config/esbuild.config.js"
+      end
+      unless File.exist?(rails_app_path.join("tsconfig.json"))
+        copy_file_to_application "decidim-core/lib/decidim/webpacker/tsconfig.json",
+                                 "tsconfig.json"
+      end
+
+      # Remove the Webpacker config and deploy shakapacker
       migrate_shakapacker
 
       # Update JS dependencies
       install_decidim_npm
     end
+  end
 
-    def migrate_shakapacker
-      remove_file_from_application "config/webpacker.yml"
-      remove_file_from_application "bin/webpack"
-      remove_file_from_application "bin/webpack-dev-server"
+  def migrate_shakapacker
+    remove_file_from_application "config/webpacker.yml"
+    remove_file_from_application "bin/webpack"
+    remove_file_from_application "bin/webpack-dev-server"
 
-      unless File.exist?(rails_app_path.join("config/shakapacker.yml"))
-        copy_file_to_application "decidim-core/lib/decidim/webpacker/shakapacker.yml", "config/shakapacker.yml"
-        remove_folder_from_application "config/webpack"
-      end
+    unless File.exist?(rails_app_path.join("config/shakapacker.yml"))
+      copy_file_to_application "decidim-core/lib/decidim/webpacker/shakapacker.yml", "config/shakapacker.yml"
+      remove_folder_from_application "config/webpack"
+    end
 
-      copy_folder_to_application "decidim-core/lib/decidim/webpacker/webpack", "config"
+    copy_folder_to_application "decidim-core/lib/decidim/webpacker/webpack", "config"
 
-      system!("bin/rails shakapacker:binstubs") unless File.exist?(rails_app_path.join("bin/shakapacker"))
+    system!("bin/rails shakapacker:binstubs") unless File.exist?(rails_app_path.join("bin/shakapacker"))
 
-      # Modify the webpack binstubs
-      add_binstub_load_path "bin/shakapacker"
-      add_binstub_load_path "bin/shakapacker-dev-server"
-    end
+    # Modify the webpack binstubs
+    add_binstub_load_path "bin/shakapacker"
+    add_binstub_load_path "bin/shakapacker-dev-server"
+  end
 
-    def install_decidim_npm
-      decidim_npm_packages.each do |type, packages|
-        system! "npm i --save-#{type} #{packages.join(" ")}"
-      end
+  def install_decidim_npm
+    decidim_npm_packages.each do |type, packages|
+      system! "npm i --save-#{type} #{packages.join(" ")}"
     end
+  end
 
-    def add_decidim_browserslist_configuration
-      package = JSON.parse(File.read(rails_app_path.join("package.json")))
-      return if package["browserslist"].is_a?(Array) && package["browserslist"].include?("extends @decidim/browserslist-config")
+  def add_decidim_browserslist_configuration
+    package = JSON.parse(File.read(rails_app_path.join("package.json")))
+    return if package["browserslist"].is_a?(Array) && package["browserslist"].include?("extends @decidim/browserslist-config")
 
-      package["browserslist"] = ["extends @decidim/browserslist-config"]
-      File.write(rails_app_path.join("package.json"), JSON.pretty_generate(package))
-    end
+    package["browserslist"] = ["extends @decidim/browserslist-config"]
+    File.write(rails_app_path.join("package.json"), JSON.pretty_generate(package))
+  end
 
-    def decidim_npm_packages
-      gem_path = unreleased_gem_path
-
-      if gem_path
-        package_spec = "./packages/%s"
-
-        # The packages folder needs to be copied to the application folder
-        # because the linked dependencies are not installed when packages
-        # are installed using file references outside the application root
-        # where the `package.json` is located at. For more information, see:
-        # https://github.com/npm/cli/issues/2339
-        FileUtils.rm_rf(rails_app_path.join("packages"))
-        FileUtils.cp_r(gem_path.join("packages"), rails_app_path)
-      else
-        package_spec = "@decidim/%s@~#{Decidim::GemManager.semver_friendly_version(decidim_gemspec.version.to_s)}"
-      end
+  def decidim_npm_packages
+    gem_path = unreleased_gem_path
 
-      local_npm_dependencies.transform_values { |names| names.map { |name| format(package_spec, name) } }
+    if gem_path
+      package_spec = "./packages/%s"
+
+      # The packages folder needs to be copied to the application folder
+      # because the linked dependencies are not installed when packages
+      # are installed using file references outside the application root
+      # where the `package.json` is located at. For more information, see:
+      # https://github.com/npm/cli/issues/2339
+      FileUtils.rm_rf(rails_app_path.join("packages"))
+      FileUtils.cp_r(gem_path.join("packages"), rails_app_path)
+    else
+      package_spec = "@decidim/%s@~#{Decidim::GemManager.semver_friendly_version(decidim_gemspec.version.to_s)}"
     end
 
-    def unreleased_gem_path
-      if decidim_gemspec.source.is_a?(Bundler::Source::Rubygems)
-        return if released_version?
+    local_npm_dependencies.transform_values { |names| names.map { |name| format(package_spec, name) } }
+  end
 
-        gem_path = Pathname(decidim_gemspec.full_gem_path)
-      else
-        gem_path = decidim_gemspec.source.path
-        gem_path = Pathname(ENV.fetch("BUNDLE_GEMFILE", nil)).dirname.join(gem_path) if gem_path.relative?
-      end
+  def unreleased_gem_path
+    if decidim_gemspec.source.is_a?(Bundler::Source::Rubygems)
+      return if released_version?
 
-      gem_path
+      gem_path = Pathname(decidim_gemspec.full_gem_path)
+    else
+      gem_path = decidim_gemspec.source.path
+      gem_path = Pathname(ENV.fetch("BUNDLE_GEMFILE", nil)).dirname.join(gem_path) if gem_path.relative?
     end
 
-    def local_npm_dependencies
-      @local_npm_dependencies ||= begin
-        package_json = JSON.parse(File.read(decidim_path.join("package.json")))
-
-        {
-          prod: local_npm_dependencies_list(package_json["dependencies"]),
-          dev: local_npm_dependencies_list(package_json["devDependencies"])
-        }.freeze
-      end
-    end
+    gem_path
+  end
 
-    def local_npm_dependencies_list(deps)
-      return [] unless deps
+  def local_npm_dependencies
+    @local_npm_dependencies ||= begin
+      package_json = JSON.parse(File.read(decidim_path.join("package.json")))
 
-      deps.values
-          .select { |ref| ref.starts_with?("file:packages/") }
-          .map { |ref| ref.delete_prefix("file:packages/") }
+      {
+        prod: local_npm_dependencies_list(package_json["dependencies"]),
+        dev: local_npm_dependencies_list(package_json["devDependencies"])
+      }.freeze
     end
+  end
 
-    def decidim_path
-      @decidim_path ||= Pathname.new(decidim_gemspec.full_gem_path) if Gem.loaded_specs.has_key?("decidim")
-    end
+  def local_npm_dependencies_list(deps)
+    return [] unless deps
 
-    def decidim_gemspec
-      @decidim_gemspec ||= Gem.loaded_specs["decidim"]
-    end
+    deps.values
+        .select { |ref| ref.starts_with?("file:packages/") }
+        .map { |ref| ref.delete_prefix("file:packages/") }
+  end
 
-    def released_version?
-      decidim_gemspec.version.segments.last != "dev"
-    end
+  def decidim_path
+    @decidim_path ||= Pathname.new(decidim_gemspec.full_gem_path) if Gem.loaded_specs.has_key?("decidim")
+  end
 
-    def rails_app_path
-      @rails_app_path ||= Rails.root
-    end
+  def decidim_gemspec
+    @decidim_gemspec ||= Gem.loaded_specs["decidim"]
+  end
 
-    def copy_file_to_application(origin_path, destination_path = origin_path)
-      FileUtils.cp(decidim_path.join(origin_path), rails_app_path.join(destination_path))
-    end
+  def released_version?
+    decidim_gemspec.version.segments.last != "dev"
+  end
 
-    def copy_folder_to_application(origin_path, destination_path = origin_path)
-      FileUtils.cp_r(decidim_path.join(origin_path), rails_app_path.join(destination_path))
-    end
+  def rails_app_path
+    @rails_app_path ||= Rails.root
+  end
 
-    def remove_file_from_application(path)
-      FileUtils.rm(path, force: true)
-    end
+  def copy_file_to_application(origin_path, destination_path = origin_path)
+    FileUtils.cp(decidim_path.join(origin_path), rails_app_path.join(destination_path))
+  end
 
-    def remove_folder_from_application(path)
-      FileUtils.rm_rf(path)
-    end
+  def copy_folder_to_application(origin_path, destination_path = origin_path)
+    FileUtils.cp_r(decidim_path.join(origin_path), rails_app_path.join(destination_path))
+  end
 
-    def add_binstub_load_path(binstub_path)
-      file = rails_app_path.join(binstub_path)
-      lines = File.readlines(file)
+  def remove_file_from_application(path)
+    FileUtils.rm(path, force: true)
+  end
 
-      # Skip if the load path is already added
-      return if lines.grep(
-        %r{^\$LOAD_PATH.unshift "#\{Gem.loaded_specs\["decidim-core"\].full_gem_path\}/lib/gem_overrides"$}
-      ).size.positive?
+  def remove_folder_from_application(path)
+    FileUtils.rm_rf(path)
+  end
 
-      contents = ""
-      lines.each do |line|
-        contents += line
-        next unless line =~ %r{^require "bundler/setup"$}
+  def add_binstub_load_path(binstub_path)
+    file = rails_app_path.join(binstub_path)
+    lines = File.readlines(file)
 
-        contents += "\n"
-        contents += "# Add the Decidim override load path to override webpacker functionality\n"
-        contents += "$LOAD_PATH.unshift \"\#{Gem.loaded_specs[\"decidim-core\"].full_gem_path}/lib/gem_overrides\"\n"
-      end
+    # Skip if the load path is already added
+    return if lines.grep(
+      %r{^\$LOAD_PATH.unshift "#\{Gem.loaded_specs\["decidim-core"\].full_gem_path\}/lib/gem_overrides"$}
+    ).size.positive?
 
-      File.write(file, contents)
-    end
+    contents = ""
+    lines.each do |line|
+      contents += line
+      next unless line =~ %r{^require "bundler/setup"$}
 
-    def system!(command)
-      system("cd #{rails_app_path} && #{command}") || abort("\n== Command #{command} failed ==")
+      contents += "\n"
+      contents += "# Add the Decidim override load path to override webpacker functionality\n"
+      contents += "$LOAD_PATH.unshift \"\#{Gem.loaded_specs[\"decidim-core\"].full_gem_path}/lib/gem_overrides\"\n"
     end
+
+    File.write(file, contents)
+  end
+
+  def system!(command)
+    system("cd #{rails_app_path} && #{command}") || abort("\n== Command #{command} failed ==")
   end
 end
 
@@ -218,9 +230,6 @@ if (config_path = Decidim::Webpacker.configuration.configuration_file)
   )
 end
 
-# Remove the yarn install prerequisity from assets:precompile
-Rake::Task["assets:precompile"].prerequisites.delete("shakapacker:yarn_install")
-
 # Add gem overrides path to the beginning in order to override rake tasks
 # Needed because of a bug in Rails 6.0 (see the overridden task for details)
 $LOAD_PATH.unshift "#{Gem.loaded_specs["decidim-core"].full_gem_path}/lib/gem_overrides"

data/lib/tasks/upgrade/decidim_active_storage_migration_tasks.rake

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :upgrade do
+    namespace :active_storage_migrations do
+      desc "Migrates inline images to ActiveStorage editor_image attachments"
+      task :migrate_inline_images_to_active_storage, [:admin_email] => :environment do |_t, args|
+        user = Decidim::User.find_by(email: args[:admin_email])
+
+        raise "Invalid admin. Please, provide the email of an admin with permissions to create editor images" unless user&.admin? && user&.admin_terms_accepted?
+
+        inline_images_available_attributes.each do |model, attributes|
+          puts "=== Updating model #{model.name} (attributes: #{attributes.join(", ")})..."
+          model.all.each do |item|
+            attributes.each do |attribute|
+              item.update(attribute => rewrite_value(item.send(attribute), user))
+            end
+          end
+          puts "=== Finished update of model #{model.name}\n\n"
+        end
+      end
+
+      def rewrite_value(value, user)
+        if value.is_a?(Hash)
+          value.transform_values do |nested_value|
+            rewrite_value(nested_value, user)
+          end
+        else
+          parser = Decidim::ContentParsers::InlineImagesParser.new(value, user:)
+          parser.rewrite
+        end
+      end
+
+      def inline_images_available_attributes
+        {
+          "Decidim::Accountability::Result" => %w(description),
+          "Decidim::Proposals::Proposal" => %w(body answer cost_report execution_period),
+          "Decidim::Votings::Voting" => %w(description),
+          "Decidim::Elections::Question" => %w(description),
+          "Decidim::Elections::Answer" => %w(description),
+          "Decidim::Elections::Election" => %w(description),
+          "Decidim::Initiative" => %w(description answer),
+          "Decidim::InitiativesType" => %w(description extra_fields_legal_information),
+          "Decidim::Assembly" => %w(short_description description purpose_of_action composition internal_organisation announcement closing_date_reason special_features),
+          "Decidim::Forms::Questionnaire" => %w(description tos),
+          "Decidim::Forms::Question" => %w(description),
+          "Decidim::Organization" => %w(
+            welcome_notification_body
+            admin_terms_of_use_body
+            admin_terms_of_service_body
+            description
+            highlighted_content_banner_short_description
+            id_documents_explanation_text
+          ),
+          "Decidim::StaticPage" => %w(content),
+          "Decidim::ContextualHelpSection" => %w(content),
+          "Decidim::Category" => %w(description),
+          "Decidim::Blogs::Post" => %w(body),
+          "Decidim::Pages::Page" => %w(body),
+          "Decidim::Sortitions::Sortition" => %w(additional_info witnesses cancel_reason),
+          "Decidim::Debates::Debate" => %w(description instructions information_updates conclusions),
+          "Decidim::Budgets::Budget" => %w(description),
+          "Decidim::Budgets::Project" => %w(description),
+          "Decidim::ConferenceSpeaker" => %w(short_bio),
+          "Decidim::Conferences::RegistrationType" => %w(description),
+          "Decidim::Conference" => %w(short_description description objectives registration_terms),
+          "Decidim::ParticipatoryProcessGroup" => %w(description),
+          "Decidim::ParticipatoryProcess" => %w(short_description description announcement),
+          "Decidim::ParticipatoryProcessStep" => %w(description),
+          "Decidim::Meetings::AgendaItem" => %w(description),
+          "Decidim::Meetings::Meeting" => %w(registration_terms description registration_email_custom_content closing_report)
+        }.each_with_object({}) do |(main_model, attributes), hash|
+          hash[main_model.constantize] = attributes
+        rescue NameError
+          hash
+        end
+      end
+    end
+  end
+end

data/lib/tasks/upgrade/decidim_content_blocks_tasks.rake

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :upgrade do
+    namespace :content_blocks do
+      desc "Initializes a default set of content blocks for each space whose landing page uses content blocks"
+      task :initialize_default_content_blocks, [:manifest_name, :space_id, :include_components] => :environment do |_task, args|
+        manifest_name = args[:manifest_name]
+        space_id = args[:space_id]&.to_i
+
+        raise "Please, provide a valid manifest name to find the space by id" if space_id.present? && manifest_name.blank?
+
+        include_components = args[:include_components] == "true"
+
+        valid_manifests = manifests_with_content_blocks
+        valid_manifests = valid_manifests.select { |manifest| manifest.name.to_s == manifest_name.to_s } if manifest_name.present?
+
+        raise "The #{manifest_name} spaces do not exist or have content blocks" if manifest_name.present? && valid_manifests.blank?
+
+        valid_manifests.each do |manifest|
+          spaces = resources_for(manifest)
+          spaces = spaces.select { |space| space.id == space_id } if space_id.present?
+
+          spaces.each do |space|
+            content_blocks_creator = Decidim::ContentBlocksCreator.new(space)
+            content_blocks_creator.create_default!
+
+            content_blocks_creator.create_components_blocks! if include_components
+          end
+        end
+      end
+
+      def manifests_with_content_blocks
+        [
+          Decidim.participatory_space_manifests,
+          Decidim.resource_manifests
+        ].map do |manifests|
+          manifests.select { |manifest| manifest.content_blocks_scope_name.present? }
+        end.flatten
+      end
+
+      def resources_for(manifest)
+        return manifest.participatory_spaces.call(Decidim::Organization.all) if manifest.respond_to?(:participatory_spaces)
+        return manifest.model_class.all if manifest.respond_to?(:model_class)
+
+        []
+      end
+    end
+  end
+end

data/lib/tasks/upgrade/decidim_deduplicate_endorsements.rake

@@ -2,7 +2,7 @@
 
 namespace :decidim do
   namespace :upgrade do
-    desc "Remove duplicated endorsements"
+    desc "Removes duplicated endorsements"
     task fix_duplicate_endorsements: :environment do
       logger = Logger.new($stdout)
       logger.info("Removing duplicate endorsements...")

data/lib/tasks/upgrade/decidim_fix_categorization.rake

@@ -2,139 +2,13 @@
 
 namespace :decidim do
   namespace :upgrade do
-    namespace :clean do
-      desc "Removes all the invalid records from search, notifications, follows and action_logs"
-      task invalid_records: [
-        :"decidim:upgrade:clean:searchable_resources",
-        :"decidim:upgrade:clean:notifications",
-        :"decidim:upgrade:clean:follows",
-        :"decidim:upgrade:clean:action_logs",
-        :"decidim:upgrade:clean:clean_deleted_users",
-        :"decidim:upgrade:clean:fix_blocked_user_notification"
-      ]
+    desc "Removes orphan categorizations"
+    task fix_orphan_categorizations: :environment do
+      logger = Logger.new($stdout)
+      logger.info("Removing orphan categorizations...")
 
-      desc "Remove data from deleted users"
-      task clean_deleted_users: :environment do
-        logger = Logger.new($stdout)
-        logger.info("=== Removing extra data from deleted users")
-        Decidim::User.where.not(deleted_at: nil).update_all(personal_url: "", about: "", notifications_sending_frequency: "none") # rubocop:disable Rails/SkipsModelValidations
-      end
-
-      desc "Removes any action logs belonging to invalid resources"
-      task :action_logs, [] => :environment do
-        puts "=== Deleting Action logs\n"
-        invalid = 0
-        Decidim::ActionLog.find_each do |log|
-          log.participatory_space if log.participatory_space_type.present?
-          log.resource if log.resource_type.present?
-
-          if log.resource_type == "Decidim::Component" && log.resource.blank?
-            log.delete
-            invalid += 1
-          end
-
-          next if log.decidim_component_id.blank?
-          next if log.component.present?
-
-          log.delete
-          invalid += 1
-        rescue NameError
-          log.delete
-          invalid += 1
-        end
-        puts "===== Deleted #{invalid} invalid action logs\n"
-      end
-
-      desc "Removes any follows belonging to invalid resources"
-      task :follows, [] => :environment do
-        puts "=== Deleting Follows\n"
-        invalid = 0
-        Decidim::Follow.find_each do |follow|
-          follow.followable
-
-          next unless follow.followable.respond_to?(:component)
-          next if follow.followable.component.present?
-
-          # We attempt to remove any of the follows that refer to spaces or components that disappeared
-          follow.destroy
-          invalid += 1
-        rescue NameError
-          # We use delete as we do not want to call the hooks
-          follow.delete
-          invalid += 1
-        end
-        puts "===== Deleted #{invalid} invalid follows\n"
-      end
-
-      desc "Removes any notifications belonging to invalid resources"
-      task :notifications, [] => :environment do
-        puts "=== Deleting Notification\n"
-        invalid = 0
-        Decidim::Notification.find_each do |notification|
-          # Check if the resource class still exists
-          notification.resource
-          # Check if the event class still exists
-          notification.event_class_instance
-        rescue NameError
-          notification.destroy
-          invalid += 1
-        end
-        puts "===== Deleted #{invalid} invalid notifications\n"
-      end
-
-      desc "Removes any resources from search index that do not exist"
-      task :searchable_resources, [] => :environment do
-        puts "=== Deleting Searchable results\n"
-        puts "==== Deleting invalid spaces \n"
-        invalid = 0
-        Decidim::SearchableResource.where.not(decidim_participatory_space_type: nil).find_each do |search|
-          search.decidim_participatory_space
-        rescue NameError
-          search.destroy!
-          invalid += 1
-        end
-        puts "===== Deleted #{invalid} invalid spaces\n"
-
-        puts "==== Deleting invalid resources from search index \n"
-        invalid = 0
-        Decidim::SearchableResource.find_each do |search|
-          next unless search.resource.respond_to?(:component)
-          next if search.resource.component.present?
-
-          search.destroy
-          invalid += 1
-        rescue NameError
-          search.destroy!
-          invalid += 1
-        end
-        puts "===== Deleted #{invalid} invalid resources\n"
-      end
-
-      desc "Removes orphan categorizations"
-      task fix_orphan_categorizations: :environment do
-        logger = Logger.new($stdout)
-        logger.info("Removing orphan categorizations...")
-
-        Decidim::Categorization.find_each do |categorization|
-          categorization.destroy if categorization.categorizable.nil?
-        end
-      end
-
-      desc "Update all blocked users notifications_sending_frequency setting"
-      task fix_blocked_user_notification: :environment do
-        logger.info("=== Updating all blocked users notifications_sending_frequency ...")
-        blocked_users = 0
-        Decidim::User.blocked.where.not("notifications_sending_frequency = ?", "none").find_each do |blocked_user|
-          unless blocked_user.notifications_sending_frequency == "none"
-            blocked_user.update(notifications_sending_frequency: "none")
-            blocked_users += 1
-          end
-        end
-        logger.info("===== Updated #{blocked_users} blocked users")
-      end
-
-      def logger
-        @logger ||= Logger.new($stdout)
+      Decidim::Categorization.find_each do |categorization|
+        categorization.destroy if categorization.categorizable.nil?
       end
     end
   end

data/lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake

@@ -2,7 +2,7 @@
 
 namespace :decidim do
   namespace :upgrade do
-    desc "Modify nicknames with random numbers when exists similar ones case insensitively"
+    desc "Modifies nicknames with random numbers when exists similar ones case-insensitively"
     task fix_nickname_uniqueness: :environment do
       logger = Logger.new($stdout)
       logger.info("Updating conflicting user nicknames...")

data/lib/tasks/upgrade/decidim_fix_short_url_resolver.rake

@@ -2,7 +2,7 @@
 
 namespace :decidim do
   namespace :upgrade do
-    desc "Fix wrongly mapped short links components"
+    desc "Fixes wrongly mapped short links components"
     task fix_short_urls: :environment do
       logger = Logger.new($stdout)
       logger.info("Fixing wrongly mapped short links...")

data/lib/tasks/upgrade/decidim_moderation_tasks.rake

@@ -3,7 +3,7 @@
 namespace :decidim do
   namespace :upgrade do
     namespace :moderation do
-      desc "Exclude all moderated content from search"
+      desc "Excludes all moderated content from search"
       task remove_from_search: :environment do
         query = Decidim::Moderation.hidden
 

data/lib/tasks/upgrade/decidim_user_moderation.rake

@@ -3,7 +3,7 @@
 namespace :decidim do
   namespace :upgrade do
     namespace :moderation do
-      desc "Add all blocked users to global moderation panel"
+      desc "Adds all blocked users to global moderation panel"
       task fix_blocked_user_panel: :environment do
         Decidim::UserBlock.find_each do |blocked_user|
           Decidim::UserModeration.where(user: blocked_user.user).first_or_create!