Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Decidim to 0.24 #9

Merged
merged 17 commits into from
Nov 4, 2021
Merged

Bump Decidim to 0.24 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c7d03ab
Bump to 0.24
Oct 28, 2021
6cd8cea
Fix tests
Quentinchampenois Oct 18, 2021
dee7d5c
Fix ruby version in tests
Oct 28, 2021
7d446a6
Linting files
Oct 28, 2021
ee30091
Fix application db initialization
moustachu Nov 3, 2021
9fa517b
Linting files
Nov 3, 2021
72a8eff
Merge branch 'bump/release/0.24-stable' of https://github.com/OpenSou…
Nov 3, 2021
fb80871
Fix application db initialization
moustachu Nov 3, 2021
c2afec0
Fix conflicts
Nov 3, 2021
7710967
Delete unused overload
Nov 3, 2021
18ef4bd
Fix tests
Nov 3, 2021
89f216e
Lint code and update tests
Nov 3, 2021
a2f66b5
Fix failing tests
Nov 3, 2021
5ab3554
Fix conflicts and fix job specs
Quentinchampenois Nov 3, 2021
1d2af18
Add machine translation job
Quentinchampenois Nov 3, 2021
e3b8c86
Remove decidim-cookies config
Nov 4, 2021
d0ab365
Remove .rspec-failures file
Nov 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lint_code.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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