Skip to content

Commit

Permalink
Merge branch 'master' of github.com:AjuntamentdeBarcelona/decidim-bar…
Browse files Browse the repository at this point in the history
…celona into feat/add-verifications-export-page-to-stats-module
  • Loading branch information
fblupi committed Nov 5, 2024
2 parents 3c8116b + 4ad485f commit 61d2320
Show file tree
Hide file tree
Showing 40 changed files with 1,182 additions and 566 deletions.
1 change: 1 addition & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,4 @@ exclude_paths:
- "decidim-ephemeral_participation/app/permissions/decidim/ephemeral_participation/ephemeral_participation_permissions.rb"
- "app/services/decidim_legacy_routes.rb"
- "app/helpers/concerns/decidim/paginate_helper_override.rb"
- "app/permissions/concerns/decidim/initiatives/admin/permissions_override.rb"
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
jobs:
lint:
name: Lint code
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
env:
DATABASE_USERNAME: postgres
DATABASE_PASSWORD: postgres
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
jobs:
test:
name: Test
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
services:
postgres:
image: postgres:11
Expand Down Expand Up @@ -47,3 +47,10 @@ jobs:
mkdir node_modules
bundle exec rspec
name: Run specs
- uses: actions/upload-artifact@v4
if: always()
with:
name: screenshots
path: ./tmp/screenshots
if-no-files-found: ignore
overwrite: true
9 changes: 8 additions & 1 deletion .github/workflows/test_census_sms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
jobs:
test:
name: Test Census SMS
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
services:
postgres:
image: postgres:11
Expand Down Expand Up @@ -47,3 +47,10 @@ jobs:
mkdir node_modules
bundle exec rspec decidim-census_sms
name: Run specs
- uses: actions/upload-artifact@v4
if: always()
with:
name: screenshots
path: ./tmp/screenshots
if-no-files-found: ignore
overwrite: true
9 changes: 8 additions & 1 deletion .github/workflows/test_stats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
jobs:
test:
name: Test Stats
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
services:
postgres:
image: postgres:11
Expand Down Expand Up @@ -47,3 +47,10 @@ jobs:
mkdir node_modules
bundle exec rspec decidim-stats
name: Run specs
- uses: actions/upload-artifact@v4
if: always()
with:
name: screenshots
path: ./tmp/screenshots
if-no-files-found: ignore
overwrite: true
49 changes: 0 additions & 49 deletions .github/workflows/test_valid_auth.yml

This file was deleted.

5 changes: 3 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,22 @@

source "https://rubygems.org"

DECIDIM_VERSION = "0.28.3"
DECIDIM_VERSION = { git: "https://github.com/AjuntamentdeBarcelona/decidim", branch: "release/0.28-stable-bcn" }.freeze

ruby RUBY_VERSION

gem "decidim", DECIDIM_VERSION
gem "decidim-initiatives", DECIDIM_VERSION
gem "decidim-sortitions", DECIDIM_VERSION
gem "decidim-templates", DECIDIM_VERSION

gem "decidim-census_sms", path: "decidim-census_sms"
gem "decidim-dataviz", path: "decidim-dataviz"
gem "decidim-ephemeral_participation", path: "decidim-ephemeral_participation" # Installed but not used anymore
gem "decidim-stats", path: "decidim-stats"
gem "decidim-valid_auth", path: "decidim-valid_auth"

gem "decidim-decidim_awesome", git: "https://github.com/decidim-ice/decidim-module-decidim_awesome"
gem "decidim-internal_evaluation", git: "https://github.com/AjuntamentdeBarcelona/decidim-internal-evaluation-module", branch: "release/0.28-stable"
gem "decidim-kids", git: "https://github.com/AjuntamentdeBarcelona/decidim-module-kids"
gem "decidim-navigation_maps", git: "https://github.com/Platoniq/decidim-module-navigation_maps"
gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer"
Expand Down
Loading

0 comments on commit 61d2320

Please sign in to comment.