Skip to content

Commit

Permalink
Merge branch 'release/0.26-stable' into 0.26-lucerne
Browse files Browse the repository at this point in the history
  • Loading branch information
microstudi committed Jan 30, 2023
2 parents 8d28c77 + e11a4db commit c145433
Show file tree
Hide file tree
Showing 88 changed files with 476 additions and 439 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci_accountability.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_admin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_admin_system_1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_admin_system_2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_assemblies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_blogs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_budgets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_comments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_conferences.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_consultations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_core_lib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_core_system.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_core_unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_debates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_dev_system.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_elections_system_admin_1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_elections_system_public.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_elections_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_forms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_generators.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_initiatives.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_initiatives_system_admin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_initiatives_system_public.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
timeout-minutes: 60
steps:
- uses: rokroskar/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_meetings_system_admin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_meetings_system_public_1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_meetings_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_participatory_processes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_proposals_system_admin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_proposals_system_public_1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_proposals_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_sortitions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_surveys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_system.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_templates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_verifications.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:
jobs:
main:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint_code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ env:
jobs:
lint:
name: Lint code
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
timeout-minutes: 60
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint_pr_format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
check_title:
name: Check PR title
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: rokroskar/[email protected]
if: "github.ref != 'refs/heads/develop'"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_docs_update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
trigger_documentation_build:
name: Trigger decidim/documentation build
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
timeout-minutes: 60
steps:
- name: Send dispatch for trigger_build workflow
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
trigger_docker_build:
name: Trigger decidim/docker build
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
timeout-minutes: 60
steps:
- name: Send dispatch for Docker Hub build
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ def proposal_find(id)
# Returns a String.
def bulk_categories_select(collection)
categories = bulk_categories_for_select collection
disabled = bulk_disabled_categories_for collection
prompt = t("decidim.proposals.admin.proposals.index.change_category")
select(:category, :id, options_for_select(categories, selected: [], disabled: disabled), prompt: prompt)
select(:category, :id, options_for_select(categories, selected: []), prompt: prompt)
end

def bulk_categories_for_select(scope)
Expand All @@ -39,10 +38,6 @@ def bulk_categories_for_select(scope)
end
end

def bulk_disabled_categories_for(scope)
scope.first_class.joins(:subcategories).pluck(:id)
end

# Public: Generates a select field with the components.
#
# siblings - A collection of components.
Expand Down
Loading

0 comments on commit c145433

Please sign in to comment.