Skip to content

Commit

Permalink
Bump decidim-decidim_awesome from 0.11.0 to 0.11.1 (#13)
Browse files Browse the repository at this point in the history
* Use the main branch of decidim awesome

* Rollback rubocop
  • Loading branch information
HHassig authored Sep 9, 2024
1 parent c6588bf commit 3c750cf
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ gem "decidim", DECIDIM_VERSION
# gem "decidim-initiatives", DECIDIM_VERSION
gem "decidim-templates", DECIDIM_VERSION

gem "decidim-decidim_awesome", git: "https://github.com/decidim-ice/decidim-module-decidim_awesome", branch: "develop"
gem "decidim-decidim_awesome"
gem "decidim-ub"

gem "bootsnap", "~> 1.3"
Expand Down
18 changes: 6 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
GIT
remote: https://github.com/decidim-ice/decidim-module-decidim_awesome
revision: b2800256f5e147452438686029b3990c89fb21be
branch: develop
specs:
decidim-decidim_awesome (0.11.0)
decidim-admin (>= 0.28.0, < 0.29)
decidim-core (>= 0.28.0, < 0.29)
deface (>= 1.5)
sassc (~> 2.3)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -286,6 +275,11 @@ GEM
decidim-debates (0.28.2)
decidim-comments (= 0.28.2)
decidim-core (= 0.28.2)
decidim-decidim_awesome (0.11.1)
decidim-admin (>= 0.28.0, < 0.29)
decidim-core (>= 0.28.0, < 0.29)
deface (>= 1.5)
sassc (~> 2.3)
decidim-dev (0.28.2)
bullet (~> 7.0)
byebug (~> 11.0)
Expand Down Expand Up @@ -890,7 +884,7 @@ DEPENDENCIES
capistrano-rbenv
capistrano-sidekiq
decidim (= 0.28.2)
decidim-decidim_awesome!
decidim-decidim_awesome
decidim-dev (= 0.28.2)
decidim-templates (= 0.28.2)
decidim-ub
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# frozen_string_literal: true
# This migration comes from decidim_decidim_awesome (originally 20240531224204)

class AddDecidimAwesomeProposalPrivateFields < ActiveRecord::Migration[6.0]
class ProposalExtraField < ApplicationRecord
self.table_name = :decidim_awesome_proposal_extra_fields
end

def change
add_column :decidim_awesome_proposal_extra_fields, :private_body, :string
add_column :decidim_awesome_proposal_extra_fields, :decidim_proposal_type, :string
reversible do |direction|
direction.up do
execute <<~SQL.squish
UPDATE decidim_awesome_proposal_extra_fields
SET decidim_proposal_type = 'Decidim::Proposals::Proposal'
SQL
end
end

remove_index :decidim_awesome_proposal_extra_fields, name: "decidim_awesome_extra_fields_on_proposal"
add_index :decidim_awesome_proposal_extra_fields,
[:decidim_proposal_id, :decidim_proposal_type],
name: "index_decidim_awesome_proposal_extra_fields_on_decidim_proposal"

change_column_null :decidim_awesome_proposal_extra_fields, :decidim_proposal_id, false
change_column_null :decidim_awesome_proposal_extra_fields, :decidim_proposal_type, false
ProposalExtraField.reset_column_information
end
end
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# frozen_string_literal: true
# This migration comes from decidim_decidim_awesome (originally 20240729164227)

class AddDecidimAwesomeProposalPrivateFieldsDate < ActiveRecord::Migration[6.1]
class ProposalExtraField < ApplicationRecord
self.table_name = :decidim_awesome_proposal_extra_fields
end

def change
add_column :decidim_awesome_proposal_extra_fields, :private_body_updated_at, :datetime

reversible do |direction|
direction.up do
execute <<~SQL.squish
UPDATE decidim_awesome_proposal_extra_fields
SET private_body_updated_at = updated_at
SQL
end
end
end
end
7 changes: 5 additions & 2 deletions db/schema.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3c750cf

Please sign in to comment.