Merge branch 'develop' into feature/redesign-staging

* develop: (30 commits) Add `process-content` to erb-lint's deprecated classes (#11762) Add possibility of overriding the tailwind.config.js (#11763) Ask old password when changing email or password (#11737) Add Projects (Budgets) to filtered search (#11740) Fix missing results on Geocoded when search without diacritics (#11761) Add robots.txt instructions (#11693) Add missing activerecord budget locales for search (#11766) Improve design of Admin's Sidebar pages (#11759) Show small static map on admin's meetings index with big screens (#11715) Remove "Manage" button when there's a Sidebar (#11717) Fix admin breadcrumb in Process (#11757) Apply new rubocop rules on erb - Layout/MultilineMethodCallIndentation (#11756) Remove xlarge-* references from admin forms (#11712) Apply new rubocop rules on erb - Argument identation (#11707) Update HERE API autocomplete (#11507) Admin redesign proposal issues (#11668) Redesign: responsive links on cards (#11538) Refactor CI pipelines (#11196) Update postcss and graphql to latest versions (#11733) Fix develop pipeline (#11750) ...
decidim · Oct 17, 2023 · 7ceeba2 · 7ceeba2
2 parents e189107 + a83d6cd
commit 7ceeba2
Show file tree

Hide file tree

Showing 1,007 changed files with 15,102 additions and 21,071 deletions.
diff --git a/.erb-lint.yml b/.erb-lint.yml
@@ -1,4 +1,8 @@
 ---
+glob: "decidim-*/app/{cells,views}/**/*.erb"
+exclude:
+  - '**/vendor/**/*'
+  - '**/node_modules/**/*'
 
 linters:
   ExtraNewline:
@@ -19,6 +23,17 @@ linters:
       - text/javascript
       - text/template
 
+  DeprecatedClasses:
+    enabled: true
+    exclude:
+      - 'decidim_app-design/**/*.erb'
+    addendum: "Please remove it from code."
+    rule_set:
+      - deprecated: ['process-content']
+        suggestion: "This class is deprecated. Please remove the surrounding element"
+      - deprecated: ['xlarge-[\w]*']
+        suggestion: "Foundation classes are deprecated."
+
   Rubocop:
     enabled: true
 
@@ -29,6 +44,36 @@ linters:
       AllCops:
         DisabledByDefault: true
 
+      Layout/InitialIndentation:
+        Enabled: false
+
+      Lint/SymbolConversion:
+        Enabled: false
+
+      Layout/SpaceInsideParens:
+        Enabled: false
+
+      Layout/SpaceAfterColon:
+        Enabled: false
+
+      Lint/UselessAssignment:
+        Enabled: false
+
+      Layout/ArgumentAlignment:
+        Enabled: true
+
+      Layout/SpaceAfterComma:
+        Enabled: false
+
+      Layout/TrailingWhitespace:
+        Enabled: false
+
+      Layout/LeadingEmptyLines:
+        Enabled: false
+
+      Layout/SpaceBeforeComma:
+        Enabled: false
+
       Style/Copyright:
         Enabled: false
 
@@ -69,7 +114,7 @@ linters:
         Enabled: false
 
       Layout/MultilineMethodCallIndentation:
-        Enabled: false
+        Enabled: true
 
       Layout/IndentationWidth:
         Enabled: false

diff --git a/.github/workflows/brakeman.yml b/.github/workflows/brakeman.yml
@@ -1,4 +1,4 @@
-name: "[CI] Brakeman analysis"
+name: "[CI] Brakeman"
 
 on:
   push:
@@ -52,7 +52,7 @@ jobs:
           - decidim-templates
           - decidim-verifications
     runs-on: ubuntu-latest
-    name: Brakeman
+    name: ${{ matrix.working-directory }}
     if: "!startsWith(github.head_ref, 'chore/l10n')"
     timeout-minutes: 60
     steps:

diff --git a/.github/workflows/ci_admin.yml b/.github/workflows/ci_admin.yml
@@ -1,4 +1,4 @@
-name: "[CI] Admin (unit tests)"
+name: "[CI] Admin"
 on:
   push:
     branches:
@@ -33,7 +33,7 @@ jobs:
           - bundle exec parallel_test --type rspec --pattern spec/ --exclude-pattern spec/system
           - bundle exec parallel_test --type rspec --pattern spec/system
     needs: build_app
-    name: Tests
+    name: ${{ matrix.test-command }}
     uses: ./.github/workflows/test_app.yml
     secrets: inherit
     with:

diff --git a/.github/workflows/ci_core.yml b/.github/workflows/ci_core.yml
@@ -1,4 +1,4 @@
-name: "[CI] Core (lib specs)"
+name: "[CI] Core"
 on:
   push:
     branches:

diff --git a/.github/workflows/ci_dev_system.yml b/.github/workflows/ci_dev_system.yml
@@ -1,4 +1,4 @@
-name: "[CI] Dev (system specs)"
+name: "[CI] Dev"
 on:
   push:
     branches:

diff --git a/.github/workflows/ci_elections.yml b/.github/workflows/ci_elections.yml
@@ -1,4 +1,4 @@
-name: "[CI] Elections (system admin)"
+name: "[CI] Elections"
 on:
   push:
     branches:

diff --git a/.github/workflows/ci_generators.yml b/.github/workflows/ci_generators.yml
@@ -1,4 +1,4 @@
-name: "[CI] Generators (Generator flags)"
+name: "[CI] Generators"
 on:
   push:
     branches:
@@ -33,7 +33,13 @@ jobs:
       fail-fast: false
       matrix:
         test-command:
-          - bundle exec parallel_test --type rspec --pattern spec/runtime/config_flags_generator_spec.rb
+          - bundle exec parallel_test --type rspec --pattern spec/runtime/branch_flag_spec.rb
+          - bundle exec parallel_test --type rspec --pattern spec/runtime/component_generator_spec.rb
+          - bundle exec parallel_test --type rspec --pattern spec/runtime/edge_flag_spec.rb
+          - bundle exec parallel_test --type rspec --pattern spec/runtime/no_flags_spec.rb
+          - bundle exec parallel_test --type rspec --pattern spec/runtime/path_flag_spec.rb
+          - bundle exec parallel_test --type rspec --pattern spec/runtime/queue_flag_spec.rb
+          - bundle exec parallel_test --type rspec --pattern spec/runtime/storage_flag_spec.rb
           - bundle exec parallel_test --type rspec --pattern spec/runtime/full_app_generator_spec.rb
           - bundle exec parallel_test --type rspec --pattern spec/lib/
     name: "[CI] Generators"
@@ -77,6 +83,12 @@ jobs:
           key: npm-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             npm-
+      - uses: actions/cache@v3
+        id: app-cache
+        with:
+          path: ./Gemfile.lock
+          key: gemfile-${{ hashFiles('Gemfile.lock') }}
+          restore-keys: gemfile-${{ hashFiles('Gemfile.lock') }}
       - run: bundle install --jobs 4 --retry 3
         name: Install Ruby deps
         working-directory: ${{ env.DECIDIM_MODULE }}

diff --git a/.github/workflows/ci_initiatives.yml b/.github/workflows/ci_initiatives.yml
@@ -1,4 +1,4 @@
-name: "[CI] Initiatives (unit tests)"
+name: "[CI] Initiatives"
 on:
   push:
     branches:

diff --git a/.github/workflows/ci_meetings.yml b/.github/workflows/ci_meetings.yml
@@ -1,4 +1,4 @@
-name: "[CI] Meetings (system admin)"
+name: "[CI] Meetings"
 on:
   push:
     branches:

diff --git a/.github/workflows/ci_proposals.yml b/.github/workflows/ci_proposals.yml
@@ -1,4 +1,4 @@
-name: "[CI] Proposals (system admin)"
+name: "[CI] Proposals"
 on:
   push:
     branches:

diff --git a/.github/workflows/lint_code.yml b/.github/workflows/lint_code.yml
@@ -22,6 +22,16 @@ concurrency:
 
 jobs:
   lint:
+    strategy:
+      fail-fast: false
+      matrix:
+        command:
+          - bundle exec rubocop -P
+          - npm run lint
+          - npm run stylelint
+          - ./.github/run_erblint.sh
+          - npm run markdownlint
+          - ./.github/run_spelling_check.sh
     name: Lint code
     runs-on: ubuntu-latest
     if: "!startsWith(github.head_ref, 'chore/l10n')"
@@ -49,15 +59,5 @@ jobs:
             npm-
       - name: Install JS dependencies
         run: npm ci
-      - run: bundle exec rubocop -P
-        name: Lint Ruby files
-      - run: npm run lint
-        name: Lint JS files
-      - run: npm run stylelint
-        name: Lint SCSS files
-      - run: ./.github/run_erblint.sh
-        name: Lint ERB files
-      - run: npm run markdownlint
-        name: Lint Markdown files
-      - run: ./.github/run_spelling_check.sh
-        name: Lint spelling
+      - run: ${{ matrix.command }}
+        name: ${{ matrix.command }}
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -267,6 +267,16 @@ Please read more in the docs:
 
 You can check more about the implementation in the [\#10700](https://github.com/decidim/decidim/pull/10700) pull request.
 
+### 3.11 Anti-spam measures in the robots.txt
+
+In order to improve the fight against spam attacks in Decidim applications, we have added a new task that helps you replace yours. Take into account that this will override your robots.txt, so if you have done any change you need to make a backup before running this task.
+
+```bash
+bundle exec rails decidim:robots:replace
+```
+
+You can see more details about this change on PR [\#11693](https://github.com/decidim/decidim/pull/11693)
+
 ## 4. Scheduled tasks
 
 Implementers need to configure these changes it in your scheduler task system in the production server. We give the examples

diff --git a/decidim-accountability/app/views/decidim/accountability/admin/results/_form.html.erb b/decidim-accountability/app/views/decidim/accountability/admin/results/_form.html.erb
@@ -31,21 +31,21 @@
       <% end %>
 
       <div class="row">
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.date_field :start_date %>
         </div>
 
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.date_field :end_date %>
         </div>
       </div>
 
       <div class="row">
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.select :decidim_accountability_status_id, statuses.map { |status| [translated_attribute(status.name), status.id, { "data-progress" => status.progress }] }, include_blank: true %>
         </div>
 
-        <div class="columns xlarge-6">
+        <div class="columns">
           <%= form.number_field :progress %>
         </div>
       </div>

diff --git a/decidim-accountability/config/locales/ar.yml b/decidim-accountability/config/locales/ar.yml
@@ -45,7 +45,6 @@ ar:
         edit: تعديل
         import: استيراد المشاريع للنتائج
         import_csv: استيراد CSV
-        new: '%{name} جديد'
         preview: معاينة
         timeline_entries: تطور المشروع
         title: الإجراءات
@@ -63,8 +62,6 @@ ar:
             name: نتيجة
           status:
             name: الحالة
-          timeline_entry:
-            name: دخول الجدول الزمني
         projects_import:
           create:
             invalid: كان هناك مشكله فى استيراد المشاريع إلى النتائج, يرجى اتباع التعليمات بعناية و التأكد من اختيار مشاريع للتنفيذ.

diff --git a/decidim-accountability/config/locales/bg.yml b/decidim-accountability/config/locales/bg.yml
@@ -36,7 +36,6 @@ bg:
         destroy: Изтрий
         edit: Редактирай
         import_csv: Импорт CVS
-        new: Ново %{name}
         preview: Преглед
         timeline_entries: Развитие на проекта
         title: Действия
@@ -52,8 +51,6 @@ bg:
             name: Резултат
           status:
             name: Статус
-          timeline_entry:
-            name: Запис във времевата линия
         results:
           edit:
             title: Редактирай резултат

diff --git a/decidim-accountability/config/locales/ca.yml b/decidim-accountability/config/locales/ca.yml
@@ -41,7 +41,9 @@ ca:
         edit: Editar
         import: Importar projectes a resultats
         import_csv: Importar CSV
-        new: Nou/va %{name}
+        new_result: Afegir resultat
+        new_status: Afegir estat
+        new_timeline_entry: Afegir entrada de la cronologia
         preview: Previsualitzar
         timeline_entries: Evolució del projecte
         title: Accions
@@ -77,14 +79,13 @@ ca:
             title: Importar resultats via CSV
         imports:
           create:
+            invalid: Hi ha hagut un problema important els resultats.
             success: S'està important el fitxer. Rebràs un correu electrònic en els pròxims minuts amb el resultat de la importació.
         models:
           result:
             name: Resultat
           status:
             name: Estat
-          timeline_entry:
-            name: Entrada de la cronologia
         projects_import:
           create:
             invalid: Hi ha hagut un problema important els projectes com a resultats, si us plau, segueix les instruccions amb cura i assegura't de marcar els projectes seleccionats per a la seva implementació.
@@ -231,6 +232,7 @@ ca:
           global_status: Estat d'execució global
         nav_breadcrumb:
           global: Execució global
+        no_results: No hi ha projectes
         search:
           search: Cercar actuacions
         show:

diff --git a/decidim-accountability/config/locales/cs.yml b/decidim-accountability/config/locales/cs.yml
@@ -43,7 +43,9 @@ cs:
         edit: Upravit
         import: Importovat projekty do výsledků
         import_csv: Importovat CSV
-        new: Nový %{name}
+        new_result: Nový výsledek
+        new_status: Nový status
+        new_timeline_entry: Nový záznam v časové ose
         preview: Náhled
         timeline_entries: Vývoj projektu
         title: Akce
@@ -79,14 +81,13 @@ cs:
             title: Importovat výsledky z CSV
         imports:
           create:
+            invalid: Při importu výsledků došlo k chybě.
             success: Soubor se začal importovat. Během několika následujících minut obdržíte e-mail s výsledkem importu.
         models:
           result:
             name: Výsledek
           status:
             name: Stav
-          timeline_entry:
-            name: Záznam v harmonogramu
         projects_import:
           create:
             invalid: Došlo k potížím při importu projektů do výsledků, postupujte prosím pečlivě podle pokynů a ujistěte se, že jste vybrali projekty pro realizaci.
@@ -241,6 +242,7 @@ cs:
           global_status: Globální stav provedení
         nav_breadcrumb:
           global: Globální provedení
+        no_results: Nebyly nalezeny žádné projekty
         search:
           search: Hledat akce
         show:

diff --git a/decidim-accountability/config/locales/da.yml b/decidim-accountability/config/locales/da.yml
@@ -36,7 +36,6 @@ da:
         destroy: Slet
         edit: Rediger
         import_csv: Importér CSV
-        new: Nyt %{name}
         preview: Eksempelvisning
         timeline_entries: Projektudvikling
         title: Handlinger
@@ -52,8 +51,6 @@ da:
             name: Resultat
           status:
             name: Status
-          timeline_entry:
-            name: Indførsel på tidslinje
         results:
           edit:
             title: Rediger resultat