Skip to content

Commit

Permalink
Bump decidim from 0.27.4 to 0.27.5 (#110)
Browse files Browse the repository at this point in the history 
* Bump decidim from 0.27.4 to 0.27.5

* Fix overrides_spec.rb

* Lock ChromeDriver to 119.0.6045.105

* Update package-lock.json
  • Loading branch information
@fblupi
fblupi authored Jan 24, 2024
1 parent baadf41 commit ae9d64c
Show file tree
Hide file tree
Showing 8 changed files with 4,036 additions and 7,749 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ jobs:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: true

- uses: nanasess/setup-chromedriver@v2
with:
chromedriver-version: 119.0.6045.105

- name: Setup & create Database
run: |
bundle exec rails db:create db:schema:load
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"

ruby RUBY_VERSION

DECIDIM_VERSION = "0.27.4"
DECIDIM_VERSION = "0.27.5"

gem "decidim", DECIDIM_VERSION
gem "decidim-consultations", DECIDIM_VERSION
Expand Down
190 changes: 95 additions & 95 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ GEM
aws-sigv4 (~> 1.4)
aws-sigv4 (1.5.0)
aws-eventstream (~> 1, >= 1.0.2)
axe-core-api (4.7.0)
axe-core-api (4.8.1)
dumb_delegator
virtus
axe-core-rspec (4.1.0)
Expand Down Expand Up @@ -178,7 +178,7 @@ GEM
actionpack (>= 5.0)
cells (>= 4.1.6, < 5.0.0)
charlock_holmes (0.7.7)
chef-utils (18.2.7)
chef-utils (18.3.0)
concurrent-ruby
childprocess (4.1.0)
coercible (1.0.0)
Expand All @@ -205,57 +205,57 @@ GEM
db-query-matchers (0.10.0)
activesupport (>= 4.0, < 7)
rspec (~> 3.0)
decidim (0.27.4)
decidim-accountability (= 0.27.4)
decidim-admin (= 0.27.4)
decidim-api (= 0.27.4)
decidim-assemblies (= 0.27.4)
decidim-blogs (= 0.27.4)
decidim-budgets (= 0.27.4)
decidim-comments (= 0.27.4)
decidim-core (= 0.27.4)
decidim-debates (= 0.27.4)
decidim-forms (= 0.27.4)
decidim-generators (= 0.27.4)
decidim-meetings (= 0.27.4)
decidim-pages (= 0.27.4)
decidim-participatory_processes (= 0.27.4)
decidim-proposals (= 0.27.4)
decidim-sortitions (= 0.27.4)
decidim-surveys (= 0.27.4)
decidim-system (= 0.27.4)
decidim-templates (= 0.27.4)
decidim-verifications (= 0.27.4)
decidim-accountability (0.27.4)
decidim-comments (= 0.27.4)
decidim-core (= 0.27.4)
decidim-admin (0.27.4)
decidim (0.27.5)
decidim-accountability (= 0.27.5)
decidim-admin (= 0.27.5)
decidim-api (= 0.27.5)
decidim-assemblies (= 0.27.5)
decidim-blogs (= 0.27.5)
decidim-budgets (= 0.27.5)
decidim-comments (= 0.27.5)
decidim-core (= 0.27.5)
decidim-debates (= 0.27.5)
decidim-forms (= 0.27.5)
decidim-generators (= 0.27.5)
decidim-meetings (= 0.27.5)
decidim-pages (= 0.27.5)
decidim-participatory_processes (= 0.27.5)
decidim-proposals (= 0.27.5)
decidim-sortitions (= 0.27.5)
decidim-surveys (= 0.27.5)
decidim-system (= 0.27.5)
decidim-templates (= 0.27.5)
decidim-verifications (= 0.27.5)
decidim-accountability (0.27.5)
decidim-comments (= 0.27.5)
decidim-core (= 0.27.5)
decidim-admin (0.27.5)
active_link_to (~> 1.0)
decidim-core (= 0.27.4)
decidim-core (= 0.27.5)
devise (~> 4.7)
devise-i18n (~> 1.2)
devise_invitable (~> 2.0)
decidim-api (0.27.4)
devise_invitable (~> 2.0, >= 2.0.9)
decidim-api (0.27.5)
graphql (~> 1.12, < 1.13)
graphql-docs (~> 2.1.0)
rack-cors (~> 1.0)
decidim-assemblies (0.27.4)
decidim-core (= 0.27.4)
decidim-blogs (0.27.4)
decidim-admin (= 0.27.4)
decidim-comments (= 0.27.4)
decidim-core (= 0.27.4)
decidim-budgets (0.27.4)
decidim-comments (= 0.27.4)
decidim-core (= 0.27.4)
decidim-comments (0.27.4)
decidim-core (= 0.27.4)
decidim-assemblies (0.27.5)
decidim-core (= 0.27.5)
decidim-blogs (0.27.5)
decidim-admin (= 0.27.5)
decidim-comments (= 0.27.5)
decidim-core (= 0.27.5)
decidim-budgets (0.27.5)
decidim-comments (= 0.27.5)
decidim-core (= 0.27.5)
decidim-comments (0.27.5)
decidim-core (= 0.27.5)
redcarpet (~> 3.5, >= 3.5.1)
decidim-consultations (0.27.4)
decidim-admin (= 0.27.4)
decidim-comments (= 0.27.4)
decidim-core (= 0.27.4)
decidim-core (0.27.4)
decidim-consultations (0.27.5)
decidim-admin (= 0.27.5)
decidim-comments (= 0.27.5)
decidim-core (= 0.27.5)
decidim-core (0.27.5)
active_link_to (~> 1.0)
acts_as_list (~> 0.9)
batch-loader (~> 1.2)
Expand All @@ -265,7 +265,7 @@ GEM
cells-rails (~> 0.1.3)
charlock_holmes (~> 0.7)
date_validator (~> 0.12.0)
decidim-api (= 0.27.4)
decidim-api (= 0.27.5)
devise (~> 4.7)
devise-i18n (~> 1.2)
diffy (~> 3.3)
Expand Down Expand Up @@ -306,15 +306,15 @@ GEM
webpacker (= 6.0.0.rc.5)
webpush (~> 1.1)
wisper (~> 2.0)
decidim-debates (0.27.4)
decidim-comments (= 0.27.4)
decidim-core (= 0.27.4)
decidim-dev (0.27.4)
decidim-debates (0.27.5)
decidim-comments (= 0.27.5)
decidim-core (= 0.27.5)
decidim-dev (0.27.5)
axe-core-rspec (~> 4.1.0)
byebug (~> 11.0)
capybara (~> 3.24)
db-query-matchers (~> 0.10.0)
decidim (= 0.27.4)
decidim (= 0.27.5)
erb_lint (~> 0.0.35)
factory_bot_rails (~> 4.8)
i18n-tasks (~> 0.9.18)
Expand All @@ -337,45 +337,45 @@ GEM
w3c_rspec_validators (~> 0.3.0)
webmock (~> 3.6)
wisper-rspec (~> 1.0)
decidim-forms (0.27.4)
decidim-core (= 0.27.4)
decidim-forms (0.27.5)
decidim-core (= 0.27.5)
wicked_pdf (~> 2.1)
wkhtmltopdf-binary (~> 0.12)
decidim-generators (0.27.4)
decidim-core (= 0.27.4)
decidim-meetings (0.27.4)
decidim-core (= 0.27.4)
decidim-forms (= 0.27.4)
decidim-generators (0.27.5)
decidim-core (= 0.27.5)
decidim-meetings (0.27.5)
decidim-core (= 0.27.5)
decidim-forms (= 0.27.5)
icalendar (~> 2.5)
decidim-pages (0.27.4)
decidim-core (= 0.27.4)
decidim-participatory_processes (0.27.4)
decidim-core (= 0.27.4)
decidim-proposals (0.27.4)
decidim-comments (= 0.27.4)
decidim-core (= 0.27.4)
decidim-pages (0.27.5)
decidim-core (= 0.27.5)
decidim-participatory_processes (0.27.5)
decidim-core (= 0.27.5)
decidim-proposals (0.27.5)
decidim-comments (= 0.27.5)
decidim-core (= 0.27.5)
doc2text (~> 0.4.5)
redcarpet (~> 3.5, >= 3.5.1)
decidim-sortitions (0.27.4)
decidim-admin (= 0.27.4)
decidim-comments (= 0.27.4)
decidim-core (= 0.27.4)
decidim-proposals (= 0.27.4)
decidim-surveys (0.27.4)
decidim-core (= 0.27.4)
decidim-forms (= 0.27.4)
decidim-templates (= 0.27.4)
decidim-system (0.27.4)
decidim-sortitions (0.27.5)
decidim-admin (= 0.27.5)
decidim-comments (= 0.27.5)
decidim-core (= 0.27.5)
decidim-proposals (= 0.27.5)
decidim-surveys (0.27.5)
decidim-core (= 0.27.5)
decidim-forms (= 0.27.5)
decidim-templates (= 0.27.5)
decidim-system (0.27.5)
active_link_to (~> 1.0)
decidim-core (= 0.27.4)
decidim-core (= 0.27.5)
devise (~> 4.7)
devise-i18n (~> 1.2)
devise_invitable (~> 2.0)
decidim-templates (0.27.4)
decidim-core (= 0.27.4)
decidim-forms (= 0.27.4)
decidim-verifications (0.27.4)
decidim-core (= 0.27.4)
devise_invitable (~> 2.0, >= 2.0.9)
decidim-templates (0.27.5)
decidim-core (= 0.27.5)
decidim-forms (= 0.27.5)
decidim-verifications (0.27.5)
decidim-core (= 0.27.5)
declarative-builder (0.1.0)
declarative-option (< 0.2.0)
declarative-option (0.1.0)
Expand All @@ -389,7 +389,7 @@ GEM
warden (~> 1.2.3)
devise-i18n (1.11.0)
devise (>= 4.9.0)
devise_invitable (2.0.8)
devise_invitable (2.0.9)
actionmailer (>= 5.0)
devise (>= 4.6)
diff-lcs (1.5.0)
Expand Down Expand Up @@ -478,7 +478,7 @@ GEM
hashie (5.0.0)
health_check (3.1.0)
railties (>= 5.0)
highline (2.1.0)
highline (3.0.1)
hkdf (0.3.0)
html-pipeline (2.14.3)
activesupport (>= 2)
Expand All @@ -497,7 +497,7 @@ GEM
rails-i18n
rainbow (>= 2.2.2, < 4.0)
terminal-table (>= 1.5.1)
icalendar (2.8.0)
icalendar (2.10.1)
ice_cube (~> 0.16)
ice_cube (0.16.4)
ice_nine (0.11.2)
Expand All @@ -507,7 +507,7 @@ GEM
invisible_captcha (0.13.0)
rails (>= 3.2.0)
jmespath (1.6.1)
json (2.6.3)
json (2.7.1)
jwt (2.7.1)
kaminari (1.2.2)
activesupport (>= 4.1.0)
Expand Down Expand Up @@ -546,7 +546,7 @@ GEM
net-smtp
marcel (1.0.2)
matrix (0.4.2)
mdl (0.12.0)
mdl (0.13.0)
kramdown (~> 2.3)
kramdown-parser-gfm (~> 1.1)
mixlib-cli (~> 2.1, >= 2.1.1)
Expand Down Expand Up @@ -718,9 +718,9 @@ GEM
rspec-core (~> 3.11.0)
rspec-expectations (~> 3.11.0)
rspec-mocks (~> 3.11.0)
rspec-cells (0.3.8)
rspec-cells (0.3.9)
cells (>= 4.0.0, < 6.0.0)
rspec-rails (>= 3.0.0, < 6.1.0)
rspec-rails (>= 3.0.0, < 6.2.0)
rspec-core (3.11.0)
rspec-support (~> 3.11.0)
rspec-expectations (3.11.0)
Expand Down Expand Up @@ -865,7 +865,7 @@ GEM
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
webmock (3.18.1)
webmock (3.19.1)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
Expand All @@ -880,7 +880,7 @@ GEM
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
wicked_pdf (2.6.3)
wicked_pdf (2.7.0)
activesupport
wisper (2.0.1)
wisper-rspec (1.1.0)
Expand All @@ -898,11 +898,11 @@ DEPENDENCIES
aws-sdk-s3
bootsnap (~> 1.7)
byebug (~> 11.0)
decidim (= 0.27.4)
decidim (= 0.27.5)
decidim-civicrm!
decidim-consultations (= 0.27.4)
decidim-consultations (= 0.27.5)
decidim-decidim_awesome!
decidim-dev (= 0.27.4)
decidim-dev (= 0.27.5)
decidim-direct_verifications!
decidim-term_customizer!
faker (~> 2.14)
Expand Down
12 changes: 12 additions & 0 deletions db/migrate/20240124134652_change_default_value_for_decidim_endorsements.decidim.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# frozen_string_literal: true
# This migration comes from decidim (originally 20231027142329)

class ChangeDefaultValueForDecidimEndorsements < ActiveRecord::Migration[6.1]
def up
change_column_default :decidim_endorsements, :decidim_user_group_id, 0
end

def down
change_column_default :decidim_endorsements, :decidim_user_group_id, nil
end
end
18 changes: 16 additions & 2 deletions db/schema.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 2023_07_28_100143) do
ActiveRecord::Schema.define(version: 2024_01_24_134652) do

# These are extensions that must be enabled in order to support this database
enable_extension "ltree"
Expand Down Expand Up @@ -750,7 +750,7 @@
t.bigint "resource_id"
t.string "decidim_author_type"
t.bigint "decidim_author_id"
t.integer "decidim_user_group_id"
t.integer "decidim_user_group_id", default: 0
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["decidim_author_type", "decidim_author_id"], name: "idx_endorsements_authors"
Expand Down Expand Up @@ -1747,6 +1747,20 @@
t.index ["role", "decidim_user_group_id"], name: "decidim_group_membership_one_creator_per_group", unique: true, where: "((role)::text = 'creator'::text)"
end

create_table "decidim_user_groups", id: :serial, force: :cascade do |t|
t.string "name", null: false
t.string "document_number", null: false
t.string "phone", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.string "avatar"
t.datetime "verified_at"
t.datetime "rejected_at"
t.integer "decidim_organization_id", null: false
t.index ["decidim_organization_id", "document_number"], name: "index_decidim_user_groups_document_number_on_organization_id", unique: true
t.index ["decidim_organization_id", "name"], name: "index_decidim_user_groups_names_on_organization_id", unique: true
end

create_table "decidim_user_moderations", force: :cascade do |t|
t.bigint "decidim_user_id"
t.integer "report_count", default: 0, null: false
Expand Down
Loading

0 comments on commit ae9d64c

Please sign in to comment.