Rails 6 upgrade by entantoencuanto · Pull Request #7471 · decidim/decidim

entantoencuanto · 2021-02-26T17:57:08Z

🎩 What? Why?

PR based on https://github.com/tremend-cofe/decidim/tree/chore/rails-6 used in #7086

This PR upgrades Decidim to use Rails 6:

Updates the names of some Rails classes which changes in Rails 6.
Changes routes in decidim_app-design to fix a double root definition.
Changes decidim-generator to get Gemfile.lock used in the generated application from the develop branch with the --edge option or the custom branch with the --branch option instead of the local decidim-generators/Gemfile.lock to prevent dependency errors.
Temporarily replaces the develop branch with this to avoid errors in decidim-generator when called with --edge or --branch mode. This change should be reverted after merging into develop
Fixes Rails 6 deprecation warnings.
Enables autoloading in Zeitwerk mode fixing remaining autoloading deprecation warnings.
Renames Decidim::DateCell by Decidim::DateRangeCell and includes some missing namespaces to avoid name conflicts in Zeitwerk mode.
Moves middlewares to /lib because they are not expected to be reloaded.
Encapsulates calls to classes in autoload paths from initializers with to_prepare callback to ensure correct autoloading.
Updates wicked_pdf gem version to fix a Rails 6 deprecation.

📌 Related Issues

Link your PR to an issue

Fixes Upgrade to Rails 6 #7288

Testing

Install a development_app with bundle exec rake development_app or install the generator and generate an application with the --edge option

📋 Checklist

🚨 Please review the guidelines for contributing to this repository.

📷 Screenshots

Please add screenshots of the changes you're proposing

♥️ Thank you!

Bump develop to next release version

* develop: Revert "Fix single initiative type" (#7800) Census access codes exportation flow (#7756) Show attachment menu as active only when subitem is active (#7774) Add Voting Ballot Styles (#7779) Fix map accessibility issue - Map bottom position missing label (#7763) Update README.adoc (#7687) Fix single initiative type (#7667) Enable Proposals Cell to take into account machine translations (#7629) Change order by weight in subassemblies (#7620) Add categories parent filter to API (#7609) Mockup design for Remaining time in voting (#7597) Upgrade to Rails 5.2.5 (#7762) Generate votings access codes (#7704)

entantoencuanto · 2021-04-07T12:11:16Z

It seems that Rack::Attack configuration for requests in census validation for elections is failing in this branch

decidim-dev/decidim-dev.gemspec

mrcasals · 2021-04-07T12:46:53Z

decidim-generators/lib/decidim/generators/app_generator.rb

+      def branch
+        return if options[:path]
+
+        @branch ||= options[:edge] ? "chore/rails-6-upgrade" : options[:branch].presence


I understand we'll need to update this right after this PR is merged, right?

Yes, after merging the branch should be reverted to "develop"

mrcasals

Looks good to me so far, even though there are some failing specs! Super nice job!

* develop: Let admins disable participatory space filters (#7819) Identify online voters (#7777) Restore vote tests in the elections module using the real bulletin board (#7802) Show initiative image in homepage (#7824) Let admins filter participatory space private users (#7817) Add Ballot Style to Census Datum (#7788) Show missing election component callout also for in-person votings (#7809) Fix canceling scope select doesnt open reveal (#7805) Fix: Reported users are displayed in all tenants (#7628) Evote - onboarding workflow (#7758) Add copy to clipboard feature to share links (#7697)

mrcasals · 2021-04-14T08:11:03Z

@entantoencuanto please, check those failing specs! 👀

develop has been merged in this branch but the changes of this reversion has been missed in the merge commit. This commit redoes the rollback changes

Rack::Attack.throttle makes use of cache to store counters. If cache_store is set to null_store the counter never reaches the limit

* develop: Ask again for access code (#7803) New Crowdin updates (#7836) Identify in person voters (#7828) CSV exporter should take into account locales from all resources (#7825) New Crowdin updates (#7797) Add missing translation for election publish_results admin log (#7835)

mrcasals · 2021-04-15T06:54:38Z

@entantoencuanto I'm merging this, congratulations!!

Could you prepare a PR fixing the branch name in app_generator.rb to point back to develop, please? 😄 https://github.com/decidim/decidim/pull/7471/files/37644111a500472a12b132525134eb9a5bba85e8#diff-c3aa8c1b16983c6e079ae25eb3f0786bcc61080eff2bbdd9e1a9a5e41d891efc, discussed in #7471 (comment)

* develop: Rails 6 upgrade (#7471)

alecslupu and others added 30 commits October 13, 2020 10:12

Merge pull request #7 from decidim/develop

09968d4

Bump develop to next release version

Merge branch 'develop' of github.com:decidim/decidim into develop

9fde202

Merge branch 'develop' of github.com:decidim/decidim into develop

0cffe2c

Merge branch 'develop' of github.com:decidim/decidim into develop

f9f5580

Merge branch 'develop' of github.com:decidim/decidim into develop

2c3c667

Merge branch 'develop' of github.com:decidim/decidim into develop

cdb057e

Merge branch 'develop' of github.com:decidim/decidim into develop

bb451bb

Merge branch 'develop' of github.com:decidim/decidim into develop

54d8b3d

Merge branch 'develop' of github.com:decidim/decidim into develop

7b0309a

Upgrade to Rails 6

b621968

Improve default behavior for background jobs

f0c1218

Change generators to not use webpack

488c2fa

Fix migrations

6f63455

Fix filename and remove include_relative

c303df4

Fix class name

207371c

Fix filename

0bac4d4

Fix more class names and filenames

89c01f1

Fix loading for Decidim::Messaging classes

59191f5

Remove require

d0f4207

Merge branch 'develop' of github.com:decidim/decidim into develop

dfdacd4

Merge branch 'develop' of github.com:tremend-cofe/decidim into develop

146c831

Merge branch 'develop' of github.com:decidim/decidim into develop

e2f0469

Merge branch 'develop' of github.com:decidim/decidim into develop

40dbd49

Merge branch 'develop' of github.com:decidim/decidim into develop

d37135b

Merge branch 'develop' of github.com:decidim/decidim into develop

b9c97ae

Merge branch 'develop' of github.com:decidim/decidim into develop

2377490

Merge branch 'develop' of github.com:decidim/decidim into develop

0c3952a

Merge branch 'develop' of github.com:decidim/decidim into develop

9909b41

Merge branch 'develop' of github.com:decidim/decidim into develop

ed02079

Merge branch 'develop' of github.com:decidim/decidim into develop

254f104

ahukkanen and others added 4 commits April 7, 2021 12:34

Fix map accessibility issue - Map bottom position missing label (#7763)

7eb31e3

Add Voting Ballot Styles (#7779)

076f2f3

Show attachment menu as active only when subitem is active (#7774)

033ce27

Census access codes exportation flow (#7756)

00a629b

entantoencuanto force-pushed the chore/rails-6-upgrade branch from d3ef0f8 to 00a629b Compare April 7, 2021 10:38

mrcasals reviewed Apr 7, 2021

View reviewed changes

decidim-dev/decidim-dev.gemspec Outdated Show resolved Hide resolved

mrcasals reviewed Apr 7, 2021

View reviewed changes

mrcasals previously approved these changes Apr 7, 2021

View reviewed changes

entantoencuanto dismissed mrcasals’s stale review via 4d02553 April 7, 2021 16:26

Upgrade rails and marcel versions

659d548

entantoencuanto force-pushed the chore/rails-6-upgrade branch from 4d02553 to 659d548 Compare April 7, 2021 16:50

entantoencuanto added 2 commits April 7, 2021 19:12

Upgrade ransack

12d4d95

entantoencuanto added 4 commits April 14, 2021 11:44

Revert "Fix single initiative type" (#7800)

fd74e02

develop has been merged in this branch but the changes of this reversion has been missed in the merge commit. This commit redoes the rollback changes

Use not null cache_store in examples using Rack::Attack

f16c28a

Rack::Attack.throttle makes use of cache to store counters. If cache_store is set to null_store the counter never reaches the limit

Upgrade rubocop dependency

3af2148

entantoencuanto force-pushed the chore/rails-6-upgrade branch from f9133d2 to 3af2148 Compare April 14, 2021 18:08

mrcasals approved these changes Apr 15, 2021

View reviewed changes

mrcasals merged commit e015b8d into develop Apr 15, 2021

mrcasals deleted the chore/rails-6-upgrade branch April 15, 2021 06:55

mrcasals added the target: developer-experience label Apr 15, 2021

entantoencuanto mentioned this pull request Apr 15, 2021

Change edge and test branch to use develop by default #7842

Merged

12 tasks

entantoencuanto added a commit that referenced this pull request Apr 15, 2021

Merge branch 'develop' into active_storage_migration

a58d646

* develop: Rails 6 upgrade (#7471)

andreslucena mentioned this pull request Jun 2, 2021

Remove deprecated Bootsnap warnings #8091

Merged

12 tasks

alecslupu mentioned this pull request Jan 29, 2024

Multiple versions of a newly created meeting #11289

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rails 6 upgrade#7471

Rails 6 upgrade#7471
mrcasals merged 193 commits intodevelopfrom
chore/rails-6-upgrade

entantoencuanto commented Feb 26, 2021 •

edited

Loading

Uh oh!

entantoencuanto commented Apr 7, 2021

Uh oh!

Uh oh!

mrcasals Apr 7, 2021

Uh oh!

entantoencuanto Apr 7, 2021

Uh oh!

mrcasals left a comment

Uh oh!

mrcasals commented Apr 14, 2021

Uh oh!

mrcasals commented Apr 15, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

Uh oh!

Conversation

entantoencuanto commented Feb 26, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🎩 What? Why?

📌 Related Issues

Testing

📋 Checklist

📷 Screenshots

Uh oh!

entantoencuanto commented Apr 7, 2021

Uh oh!

Uh oh!

mrcasals Apr 7, 2021

Choose a reason for hiding this comment

Uh oh!

entantoencuanto Apr 7, 2021

Choose a reason for hiding this comment

Uh oh!

mrcasals left a comment

Choose a reason for hiding this comment

Uh oh!

mrcasals commented Apr 14, 2021

Uh oh!

mrcasals commented Apr 15, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

entantoencuanto commented Feb 26, 2021 •

edited

Loading