Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit c212555
Author: Ivan Vergés <[email protected]>
Date:   Tue Nov 14 12:31:12 2023 +0100

    fixes

commit 70452d9
Author: Ivan Vergés <[email protected]>
Date:   Thu Nov 9 17:04:17 2023 +0100

    update awesome

commit a1e23cf
Author: Ivan Vergés <[email protected]>
Date:   Thu Nov 9 12:00:11 2023 +0100

    add missing envs

commit 9590a68
Author: Anna Topalidi <[email protected]>
Date:   Wed Oct 11 11:00:29 2023 +0200

    upgrade 27

commit 566683e
Author: Ivan Vergés <[email protected]>
Date:   Thu Jul 27 18:19:34 2023 +0200

    update awesome

commit 2e180a6
Author: Ivan Vergés <[email protected]>
Date:   Thu Jul 27 17:46:58 2023 +0200

    update awesome

commit 7500574
Author: Ivan Vergés <[email protected]>
Date:   Thu Jul 27 14:46:29 2023 +0200

    enable admin accountability

commit dff35fa
Author: Ivan Vergés <[email protected]>
Date:   Thu Jul 27 14:33:07 2023 +0200

    update awesome

commit 0874125
Author: Ivan Vergés <[email protected]>
Date:   Wed Jun 7 11:35:35 2023 +0200

    update action delegator
  • Loading branch information
microstudi committed Nov 14, 2023
1 parent 5fb4170 commit e4f1c47
Show file tree
Hide file tree
Showing 1,678 changed files with 310,876 additions and 69,505 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.4
RUBY_VERSION: 3.0.6
NODE_VERSION: 12.9.1

jobs:
lint:
name: Lint code
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
if: "!startsWith(github.head_ref, 'chore/l10n')"
steps:
- uses: actions/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.7
RUBY_VERSION: 3.0.6
NODE_VERSION: 16.9.0
RAILS_ENV: test
DATABASE_USERNAME: postgres
Expand All @@ -17,7 +17,7 @@ env:
jobs:
test:
name: RSpec
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
services:
postgres:
image: postgres:11
Expand Down
8 changes: 1 addition & 7 deletions .rubocop_ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,7 @@ AllCops:
# If a value is specified for TargetRubyVersion then it is used.
# Else if .ruby-version exists and it contains an MRI version it is used.
# Otherwise we fallback to the oldest officially supported Ruby version (2.0).
TargetRubyVersion: 2.7

RSpec:
Patterns:
- "(?:^|/)spec/"
- "(?:^|/)test/"
TargetRubyVersion: 3.0

# Indent private/protected/public as deep as method definitions
Layout/AccessModifierIndentation:
Expand Down Expand Up @@ -1751,4 +1746,3 @@ Faker/DeprecatedArguments:
questions:
- number
- supplemental

2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.7
3.0.6
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.7 AS builder
FROM ruby:3.0 AS builder

RUN apt-get update && apt-get upgrade -y && apt-get install gnupg2 && \
curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
Expand Down Expand Up @@ -76,7 +76,7 @@ RUN mv config/credentials.bak config/credentials 2>/dev/null || true
RUN rm -rf node_modules tmp/cache vendor/bundle test spec app/packs .git

# This image is for production env only
FROM ruby:2.7-slim AS final
FROM ruby:3.0-slim AS final

RUN apt-get update && apt-get upgrade -y && apt-get install -y gnupg2 curl && \
curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
Expand Down Expand Up @@ -122,4 +122,4 @@ HEALTHCHECK --interval=1m --timeout=5s --start-period=30s \


ENTRYPOINT ["/app/entrypoint.sh"]
CMD ["/usr/bin/supervisord"]
CMD ["/usr/bin/supervisord"]
7 changes: 3 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ source "https://rubygems.org"

ruby RUBY_VERSION

DECIDIM_VERSION = { github: "decidim/decidim", ref: "release/0.26-stable" }.freeze
DECIDIM_VERSION = { github: "decidim/decidim", ref: "release/0.27-stable" }.freeze

gem "decidim", DECIDIM_VERSION
gem "decidim-consultations", DECIDIM_VERSION

gem "decidim-action_delegator", github: "coopdevs/decidim-module-action_delegator", branch: "auto-verification"
gem "decidim-action_delegator", github: "coopdevs/decidim-module-action_delegator", branch: "main"
gem "decidim-decidim_awesome", github: "decidim-ice/decidim-module-decidim_awesome"
gem "decidim-term_customizer", github: "mainio/decidim-module-term_customizer", branch: "release/0.26-stable"
gem "decidim-term_customizer", github: "mainio/decidim-module-term_customizer", branch: "master"

gem "bootsnap", "~> 1.7"
gem "puma", ">= 5.0.0"
Expand Down Expand Up @@ -42,7 +42,6 @@ end

group :production do
gem "aws-sdk-s3", require: false
gem "fog-aws"
gem "sidekiq"
gem "sidekiq-cron"
end
Loading

0 comments on commit e4f1c47

Please sign in to comment.