update 26 (#24)

* upgrade application

* add sidekiq configuration

* update calendar

* rubycop

* fix overrides

* update decidim

* update capistrano gems

* fix actioncable

* update decidim

* fix decidim diff errors

* add term customizer

* update calendar for term customizer compatibility

* update calendar for term customizer compatibility

* update diff

* fix date helper

.github/workflows/lint.yml

@@ -1,22 +1,19 @@
-name: Lint
+name: "[CI] Lint"
 
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 
 env:
-  RUBY_VERSION: 2.7.2
-  NODE_VERSION: 12.9.1
-
+  RUBY_VERSION: 2.7.6
+
 jobs:
-  lint:
-    name: Lint code
+  lint-report:
     runs-on: ubuntu-latest
-    if: "!startsWith(github.head_ref, 'chore/l10n')"
     steps:
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v2
         with:
           fetch-depth: 1
 
@@ -25,13 +22,5 @@ jobs:
           ruby-version: ${{ env.RUBY_VERSION }}
           bundler-cache: true
 
-      - uses: actions/setup-node@master
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-
       - run: bundle exec rubocop -P
         name: Lint Ruby files
-
-      - run: bundle exec mdl *.md
-        name: Lint Markdown files
-

.github/workflows/test.yml

@@ -1,29 +1,33 @@
-name: Test
+name: "[CI] Test"
 
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 
 env:
-  RUBY_VERSION: 2.7.2
-  NODE_VERSION: 12.9.1
-
+  RUBY_VERSION: 2.7.6
+
 jobs:
-  test:
-    name: Test
+  test-report:
     runs-on: ubuntu-latest
+
     services:
       postgres:
         image: postgres:11
-        ports:
-          - 5432:5432
+        ports: ["5432:5432"]
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
         env:
-          DATABASE_USERNAME: postgres
-          DATABASE_PASSWORD: postgres
-          POSTGRES_HOST_AUTH_METHOD: trust
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+          POSTGRES_PASSWORD: postgres
+    env:
+      DATABASE_USERNAME: postgres
+      DATABASE_PASSWORD: postgres
+      DATABASE_HOST: localhost
 
     steps:
       - uses: actions/checkout@v2
@@ -44,7 +48,9 @@ jobs:
           DATABASE_PASSWORD: postgres
 
       - name: Precompile assets
-        run: bundle exec rake assets:precompile
+        run: |
+          yarn install
+          bundle exec rake assets:precompile
         env:
           RAILS_ENV: test
 
@@ -53,4 +59,4 @@ jobs:
         env:
           RAILS_ENV: test
           DATABASE_USERNAME: postgres
-          DATABASE_PASSWORD: postgres
+          DATABASE_PASSWORD: postgres

.gitignore

@@ -23,6 +23,8 @@
 
 /node_modules
 /yarn-error.log
+yarn-debug.log*
+.yarn-integrity
 
 /public/assets
 .byebug_history
@@ -41,4 +43,8 @@ config/deploy*
 
 .rspec-failures
 .vscode/*
-.rbenv-vars
+.rbenv-vars
+/public/packs
+/public/packs-test
+/public/decidim-packs
+/public/decidim-packs-test

.ruby-version

@@ -1 +1 @@
-2.7.2
+2.7.6

Gemfile

@@ -4,62 +4,52 @@ source "https://rubygems.org"
 
 ruby RUBY_VERSION
 
-DECIDIM_VERSION = { git: "https://github.com/Platoniq/decidim", tag: "fix/comparisons" }.freeze
+DECIDIM_VERSION = { git: "https://github.com/openpoke/decidim", tag: "diff-booster" }.freeze
+# DECIDIM_VERSION = "~> 0.26.2"
 
 gem "decidim", DECIDIM_VERSION
 # gem "decidim-consultations", DECIDIM_VERSION
 # gem "decidim-initiatives", DECIDIM_VERSION
-gem "decidim-decidim_awesome", "~> 0.7.0"
-gem "decidim-templates", DECIDIM_VERSION
-# gem "decidim-term_customizer"
-gem "decidim-analytics", git: "https://github.com/digidemlab/decidim-module-analytics"
-gem "decidim-calendar"
+gem "decidim-calendar", git: "https://github.com/openpoke/decidim-module-calendar", tag: "update-26"
 gem "decidim-conferences", DECIDIM_VERSION
+gem "decidim-decidim_awesome"
 gem "decidim-direct_verifications"
+gem "decidim-templates", DECIDIM_VERSION
+gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer", tag: "master"
 
-gem "bootsnap", "~> 1.4"
-# a bug in 2.8.0 is preventing precompilation
-# https://github.com/rails/execjs/issues/99
-gem "execjs", "~> 2.7.0"
-
-gem "puma", ">= 5.0.0"
-gem "uglifier", "~> 4.1"
+gem "bootsnap", "~> 1.7"
 
-gem "wicked_pdf", "~> 1.4"
+gem "puma"
+gem "uglifier"
 
 gem "deepl-rb", require: "deepl"
 
-gem "faker", "~> 2.14"
-gem "rspec"
-gem "rubocop-faker"
-
-gem "figaro"
-gem "whenever", require: false
-
 group :development, :test do
-  gem "byebug", "~> 11.0", platform: :mri
+  gem "byebug", platform: :mri
+  gem "rubocop-faker"
 
   gem "decidim-dev", DECIDIM_VERSION
+  gem "faker", "~> 2.18"
 end
 
 group :development do
-  gem "letter_opener_web", "~> 1.3"
-  gem "listen", "~> 3.1"
-  gem "spring", "~> 2.0"
-  gem "spring-watcher-listen", "~> 2.0"
-  gem "web-console", "~> 3.5"
-
-  gem "capistrano", "~> 3.15"
-  gem "capistrano-bundler", "~> 2.0", require: false
-  gem "capistrano-figaro-yml", "~> 1.0.2", require: false
-  gem "capistrano-passenger", "~> 0.2.0", require: false
-  gem "capistrano-rails", "~> 1.6", require: false
+  gem "letter_opener_web"
+  gem "listen"
+  gem "spring"
+  gem "spring-watcher-listen"
+  gem "web-console"
+
+  gem "capistrano", "~> 3.17", require: false
+  gem "capistrano-bundler", require: false
+  gem "capistrano-passenger", require: false
+  gem "capistrano-rails", require: false
   gem "capistrano-rails-console", require: false
-  gem "capistrano-rbenv", "~> 2.2", require: false
-  gem "passenger", "~> 6.0"
+  gem "capistrano-rbenv", require: false
+  gem "capistrano-sidekiq", require: false
 end
 
 group :production do
-  gem "daemons"
-  gem "delayed_job_active_record"
+  gem "figaro"
+  gem "sidekiq"
+  gem "sidekiq-cron"
 end