Skip to content

Commit

Permalink
Merge pull request #9 from OpenSourcePolitics/bump/release/0.24-stable
Browse files Browse the repository at this point in the history
 Bump Decidim to 0.24
  • Loading branch information
MoretS authored Nov 4, 2021
2 parents 7bbfe66 + d0ab365 commit d205462
Show file tree
Hide file tree
Showing 68 changed files with 1,019 additions and 468 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint_code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
env:
CI: "true"
SIMPLECOV: "true"
RUBY_VERSION: 2.6.6
RUBY_VERSION: 2.7.1

jobs:
lint:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ on:
env:
CI: "true"
SIMPLECOV: "true"
RUBY_VERSION: 2.6.6
RUBY_VERSION: 2.7.1
RUBYOPT: "-W0"

jobs:
tests:
Expand Down
4 changes: 4 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -735,6 +735,10 @@ Layout/MultilineOperationIndentation:
# But it can be overridden by setting this parameter
IndentationWidth: ~

Lint/MissingSuper:
Exclude:
- 'app/commands/**/*'

Style/NumericLiterals:
MinDigits: 5

Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.6
2.7.1
14 changes: 6 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,21 @@ source "https://rubygems.org"

ruby RUBY_VERSION

DECIDIM_VERSION = { git: "https://github.com/decidim/decidim.git", branch: "release/0.23-stable" }.freeze
DECIDIM_VERSION = { git: "https://github.com/decidim/decidim.git", branch: "release/0.24-stable" }.freeze

gem "decidim", DECIDIM_VERSION

gem "decidim-cookies", git: "https://github.com/OpenSourcePolitics/decidim-module_cookies.git", branch: "release/0.23-stable"
gem "decidim-decidim_awesome", "~> 0.6.0"
# gem "decidim-navbar_links", git: "https://github.com/OpenSourcePolitics/decidim-module-navbar_links.git", branch: "0.23.5"
gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer.git", branch: "0.23-stable"
gem "decidim-decidim_awesome", "~> 0.7.0"
gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer.git", branch: "master"

gem "bootsnap", "~> 1.3"
gem "bootsnap", "~> 1.4"

gem "dotenv-rails"

gem "puma", "~> 4.3"
gem "puma", "~> 5.3.1"
gem "uglifier", "~> 4.1"

gem "faker", "~> 1.8"
gem "faker", "~> 2.14"

gem "ruby-progressbar"

Expand Down
Loading

0 comments on commit d205462

Please sign in to comment.