Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to 0.28 - Initial adaptation #253

Merged
merged 127 commits into from
Feb 8, 2024
Merged
Show file tree
Hide file tree
Changes from 95 commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
081128f
Set decidim version to use develop branch
entantoencuanto Nov 17, 2023
c7f5c2e
Update js dependencies
entantoencuanto Nov 17, 2023
0d46c7f
Move ProposalMCellOverride to ProposalLCellOverride
entantoencuanto Nov 17, 2023
4c76545
Define set_component_breadcrumb_item in blank_component controller
entantoencuanto Nov 17, 2023
0208180
Set content security policies on iframes controller show action
entantoencuanto Nov 17, 2023
5007ec3
Redesign awesome iframe component
entantoencuanto Nov 17, 2023
797ed99
Replace stylesheet_pack_tag and jasvascript_pack_tag prefixing with a…
entantoencuanto Nov 17, 2023
fc7c217
Use tailwind variables
entantoencuanto Nov 17, 2023
6ded681
Replace no longer existing variable
entantoencuanto Nov 17, 2023
339761f
Replace snippets use in awesome map helper
entantoencuanto Nov 17, 2023
85e5485
Comment deprecated source in awesome_map.js
entantoencuanto Nov 17, 2023
e4df632
Small redesign in awesome map js to use default marker
entantoencuanto Nov 17, 2023
a92c034
Disable temporarily js and css introduced by awesome
entantoencuanto Nov 17, 2023
3350382
Disable temporarily deface overrides
entantoencuanto Nov 17, 2023
5686e58
Update components layouts
entantoencuanto Nov 20, 2023
9da78ca
Replace modal of admin config constraints with remote modals
entantoencuanto Nov 21, 2023
6fad945
Recover custom styles render in front
entantoencuanto Nov 22, 2023
1a1fa72
adapt forms with help_texts
Crashillo Nov 22, 2023
c6d3893
Redefine icons and register missing ones
entantoencuanto Nov 22, 2023
5cbdec1
Refactor admin menus to use redesign
entantoencuanto Nov 22, 2023
339f51c
Fix missing wrong icon reference
entantoencuanto Nov 23, 2023
756e1be
Disable by default awesome tweaks pending of redesign
entantoencuanto Nov 23, 2023
e08eb06
refactor tweaks for admin form functionality
Crashillo Nov 23, 2023
f054102
replace select2 with tom-select for config/admin
Crashillo Nov 23, 2023
7c5ddd5
Upgrade faker version in Gemfile
entantoencuanto Nov 23, 2023
1388261
Upgrade Decidim and update Gemfile.lock
entantoencuanto Nov 23, 2023
ac7efb2
Remove deprecated awesome iframe no_margins setting
entantoencuanto Nov 23, 2023
cd98d14
Fix awesome iframe tests
entantoencuanto Nov 23, 2023
5fa3c14
Upgrade tests workflow ruby and node versions
entantoencuanto Nov 23, 2023
6a6e49e
style button at the bototm
Crashillo Nov 24, 2023
a3a26dc
remove needless colors
Crashillo Nov 24, 2023
c093c4e
better looking list constraints
Crashillo Nov 24, 2023
31e3184
missing color
Crashillo Nov 24, 2023
f79afe7
restore codemirror
Crashillo Nov 24, 2023
54c16e3
remove unused packs and set properly the order of scripts
Crashillo Nov 24, 2023
d6b8ff6
refactor menu_hacks
Crashillo Nov 24, 2023
fa0745f
refactor system compat
Crashillo Nov 24, 2023
a600309
Adapt scoped admin management tests
entantoencuanto Nov 24, 2023
84375e4
Adapt menu overrides admin management tests
entantoencuanto Nov 24, 2023
db53a60
Avoid undefined method exception when proposal custom fields feature …
entantoencuanto Nov 27, 2023
8f17e93
Update expected texts in tests
entantoencuanto Nov 27, 2023
d994a3a
Update selectors in tests
entantoencuanto Nov 27, 2023
bcd294c
Update submit interaction in tests
entantoencuanto Nov 27, 2023
ff8d2ac
Fix callout selector in tests
entantoencuanto Nov 27, 2023
ec5eb8b
Add skips to integration tests of features pending to be adapted to D…
entantoencuanto Nov 27, 2023
9d91730
Fix selector in test
entantoencuanto Nov 27, 2023
3cac204
Add skips in tests for disabled features
entantoencuanto Nov 27, 2023
ef9fd3a
Adapt selectors
entantoencuanto Nov 27, 2023
728d93f
Add skip to tests
entantoencuanto Nov 27, 2023
e563c60
Force config enabled for controller test
entantoencuanto Nov 27, 2023
6b5fdf0
Add skip to tests
entantoencuanto Nov 27, 2023
2e642a3
Fix renamed organization attribute
entantoencuanto Nov 27, 2023
f602d21
Force config enabled for permissions test
entantoencuanto Nov 27, 2023
21bbe4e
Skip tests
entantoencuanto Nov 27, 2023
bc8aaba
Normalize locales
entantoencuanto Nov 27, 2023
afef9ad
Recover translation removed in 0.28
entantoencuanto Nov 27, 2023
475c1cb
Add skips pending of disabled features in configuration
entantoencuanto Nov 27, 2023
e8857cd
Use current_component in blank_component_controller
entantoencuanto Nov 28, 2023
e34df71
Update TargetRubyVersion in rubocop config
entantoencuanto Nov 28, 2023
d6e44c6
Update rubocop configuration
entantoencuanto Nov 28, 2023
1dd58f2
Autocorrect rubocop offenses
entantoencuanto Nov 28, 2023
e317f9d
Unsafe autocorrect rubocop offenses
entantoencuanto Nov 28, 2023
8b88556
Add exclusions in rubocop configuration
entantoencuanto Nov 28, 2023
e32d39b
Fix rubocop finders offenses
entantoencuanto Nov 28, 2023
8df5559
Fix rubocop factories offenses
entantoencuanto Nov 28, 2023
c87b2fc
Recover js dependencies with decidim 0.27
entantoencuanto Nov 28, 2023
92c71d4
Fix js and styles linters offenses
entantoencuanto Nov 28, 2023
0dcd3ca
Skip tests
entantoencuanto Nov 28, 2023
a320aa8
Fix association in factories
entantoencuanto Nov 28, 2023
4d261ad
Skip tests
entantoencuanto Nov 28, 2023
57ecc01
Add skips to integration tests of features pending to be adapted to 0.28
entantoencuanto Nov 28, 2023
15d0be2
Fix expected background in test
entantoencuanto Nov 28, 2023
7efb1e1
Adapt menu hacks tests to 0.28
entantoencuanto Nov 28, 2023
107cc9e
Revert "Recover js dependencies with decidim 0.27"
entantoencuanto Nov 28, 2023
442d02b
Add external link behavior to breadcrumb_root_menu_item_presenter
entantoencuanto Nov 28, 2023
12c4407
Update test
entantoencuanto Nov 28, 2023
8d34e1a
Fix expected text in examples
entantoencuanto Nov 28, 2023
03df795
Remove proposal from tests which breaks database constraints
entantoencuanto Nov 28, 2023
a694d79
Fix selector in test
entantoencuanto Nov 28, 2023
b43f0cc
Add skip to feature not adapted yet to 0.28
entantoencuanto Nov 28, 2023
252660a
Remove tests-legacy workflow
entantoencuanto Nov 28, 2023
c0e72d1
Rename 0.27 tests
entantoencuanto Nov 28, 2023
3572099
Upgrade Decidim to release/0.28-stable branch
entantoencuanto Nov 30, 2023
8092a5b
Add home_content_block_menu to awesome configurations
entantoencuanto Dec 4, 2023
9433930
Manage menus using menu_id param
entantoencuanto Dec 4, 2023
9b55a36
Add submenus for menu hacks
entantoencuanto Dec 4, 2023
a63e42a
Fix translations
entantoencuanto Dec 4, 2023
59a8901
Adapt menu hacks tests to multiple menus
entantoencuanto Dec 5, 2023
d841096
Add tests to home content block menu hacks
entantoencuanto Dec 5, 2023
b08d9b9
Adapt admin spec
entantoencuanto Dec 5, 2023
512d7ab
Add definition extracted from shared context
entantoencuanto Dec 5, 2023
ea8d3d0
Remove references to legacy_version from enabled tests
entantoencuanto Dec 5, 2023
ce0f45d
Don't override active attribute of menu items provided by Decidim
entantoencuanto Dec 12, 2023
103ed98
Change menu hacks to keep the breadcrumb original structure
entantoencuanto Dec 12, 2023
f1a3143
fix the constraint modla form after updates
Crashillo Dec 13, 2023
e869788
Apply suggestions from code review
entantoencuanto Jan 24, 2024
2bdc60d
Expand limits of COMPAT_DECIDIM_VERSION
entantoencuanto Jan 24, 2024
8f873a4
Update Gemfile and package.json
entantoencuanto Jan 24, 2024
74bd794
Update Gemfile.lock
entantoencuanto Jan 24, 2024
45e0025
Update package-lock.json
entantoencuanto Jan 24, 2024
b08db85
Merge branch 'main' into redesign
entantoencuanto Jan 24, 2024
a852657
Fix rubocop-capybara version
entantoencuanto Jan 26, 2024
0b870b7
Remove unnecesary linter disable directive comment
entantoencuanto Jan 26, 2024
dc09774
Merge branch 'develop' into redesign
microstudi Feb 7, 2024
b3e8c15
restore js linting
microstudi Feb 7, 2024
3e742bc
update versions
microstudi Feb 7, 2024
979f580
remove legacy conditionals
microstudi Feb 7, 2024
68e7aac
rubocop fix
microstudi Feb 7, 2024
88c1542
enforce chromedriver 119
microstudi Feb 7, 2024
1673578
fix stylelint
microstudi Feb 7, 2024
11b355a
use parallel tests
microstudi Feb 7, 2024
bef2705
fix gemfile
microstudi Feb 7, 2024
b27c681
use parallel tests
microstudi Feb 7, 2024
caddf66
debug
microstudi Feb 7, 2024
31b5aab
debug
microstudi Feb 7, 2024
a554671
debug
microstudi Feb 7, 2024
09ad622
fix gemfile location
microstudi Feb 7, 2024
93e4f47
fixes
microstudi Feb 7, 2024
07f0fb9
add missing binaries
microstudi Feb 7, 2024
35403e7
Use multi step actions
microstudi Feb 7, 2024
5b0f391
fix postgres access
microstudi Feb 7, 2024
08353bf
fix postgres access
microstudi Feb 7, 2024
7e267c8
fix tests
microstudi Feb 8, 2024
2ced958
fix excludes
microstudi Feb 8, 2024
41eb748
reorganize system tests
microstudi Feb 8, 2024
a737e73
syntaxt
microstudi Feb 8, 2024
24e757b
fix checks spec
microstudi Feb 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
pull_request:

env:
RUBY_VERSION: 3.0.6
NODE_VERSION: 16.9.1
RUBY_VERSION: 3.1.1
NODE_VERSION: 16.18.1
entantoencuanto marked this conversation as resolved.
Show resolved Hide resolved

jobs:
lint-report:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/precompile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
pull_request:

env:
RUBY_VERSION: 3.0.6
NODE_VERSION: 16.9.1
RUBY_VERSION: 3.1.1
NODE_VERSION: 16.18.1
entantoencuanto marked this conversation as resolved.
Show resolved Hide resolved

jobs:
lint-report:
Expand Down
79 changes: 0 additions & 79 deletions .github/workflows/tests-legacy.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "[CI] Tests 0.27"
name: "[CI] Tests 0.28"

on:
push:
Expand All @@ -9,8 +9,8 @@ on:
env:
CI: 1
SIMPLECOV: 1
NODE_VERSION: 16.9.1
RUBY_VERSION: 3.0.6
NODE_VERSION: 16.18.1
RUBY_VERSION: 3.1.1
entantoencuanto marked this conversation as resolved.
Show resolved Hide resolved
BUNDLE_GEMFILE: Gemfile

jobs:
Expand Down
10 changes: 8 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
inherit_from:
- .rubocop_ruby.yml
- .rubocop_rails.yml
- config/rubocop/ruby.yml
- config/rubocop/rails.yml
- config/rubocop/rspec.yml
- config/rubocop/faker.yml
- config/rubocop/disabled.yml
entantoencuanto marked this conversation as resolved.
Show resolved Hide resolved

RSpec/IndexedLet:
Enabled: false
4 changes: 2 additions & 2 deletions Gemfile
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 = { git: "https://github.com/decidim/decidim.git", branch: "release/0.28-stable" }.freeze
entantoencuanto marked this conversation as resolved.
Show resolved Hide resolved

gem "decidim", DECIDIM_VERSION
gem "decidim-decidim_awesome", path: "."
Expand All @@ -13,7 +13,7 @@ gem "bootsnap", "~> 1.4"

gem "puma", ">= 5.5.1"

gem "faker", "~> 2.14"
gem "faker", "~> 3.2"

group :development, :test do
gem "byebug", "~> 11.0", platform: :mri
Expand Down
Loading
Loading