Skip to content

Commit

Permalink
Bump/update versions (#163)
Browse files Browse the repository at this point in the history
* Bump ruby, node version and dependencies

* Remove not needed initializers

* Upgrade Decidim

* Migrate database

* Reinstall webpacker

* Update js dependencies

* Support multiple platforms for bundler

* Remove proposal cell override

* Remove not needed override verifications authorize user

* Move overrides to extend for meetings controller

* Remove not needed override pp controller

* Update proposals controller

* Remove verif controller override

* Remove deprecated events override

* Remove deprecated model proposal override

* Remove deprecated queries PP override

* Remove deprecated meetings serializer override

* Fix undefined Decidim::Devise.setup method

* Update views layouts wrapper

* Fix undefined 'favicon' method from LayoutHelper

* Remove not needed scopes picker from PR '#56'

* Remove unnecessary user answers serializer override

* Remove unnecessary decidim test promoted pp override

* Update i18n specs and remove awesome module

* Add omniauth publik

* Fix rubocop offenses

* Remove unnecessary meetings system specs

* Update authentication specs

* Update account system specs

* Update specs for homepage

* Remove not needed specs

* Exclude 'bin' folder in rubocop rules

* Fix rubocop offenses

* Exclude 'bin' directory in rubocop

* Update view layout main_footer

* Add france connect omniauth strategy

* Add decidim awesome

* [Github Actions] - Fix Rspec CI and rules (#124)

* Update GH workflows

* Update GH Actions rules

* Fix rubocop offense

* Fix undefined method blocked for admins (#120)

* Add spam detection

* Add term custo and phone AH gems (#149)

Co-authored-by: armandfardeau <[email protected]>

* Add friendly sign up (#145)

* Add friendly sign up

* Fix offenses

* Do migrate

* Update tests

* Add exports to queues

* Fix rack attack

* Move logging to suscriber

* Add missing queue

* Fix 0.26 release branch (#152)

* Add decidim conferences (#156)

* Rack Attack - Throttle 100 requests / minute (#157)

* Throttle 10requests / second

* Update rack attack rules

* Fix rails logger

* Resolve conflicts between 0.26 and develop

* Bump 0.26 version to make it compatible with develop branch

* Update packages

* Fix tests

* Add Gemfile lock and platforms support

* Add JS dependencies

* Upgrade Decidim js dependencies

* Add missing js dependencies

* Remove unnecessary seeds

* add leaflet markercluster

Co-authored-by: quentinchampenois <[email protected]>
Co-authored-by: Armand Fardeau <[email protected]>
Co-authored-by: armandfardeau <[email protected]>
  • Loading branch information
4 people authored Sep 27, 2022
1 parent 110ec8d commit a7fe3e1
Show file tree
Hide file tree
Showing 383 changed files with 140,819 additions and 15,308 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,10 @@ vendor/cache
# Ignore RSpec failures
.rspec-failures

/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity
.idea
3 changes: 3 additions & 0 deletions .rubocop_ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ AllCops:
- "vendor/**/*"
- "node_modules/**/*"
- "db/schema.rb"
- "bin/*"
# Default formatter will be used if no -f/--format option is given.
DefaultFormatter: progress
# Cop names are not displayed in offense messages by default. Change behavior
Expand Down Expand Up @@ -520,6 +521,8 @@ Style/FormatStringToken:

Style/FrozenStringLiteralComment:
EnforcedStyle: always
Exclude:
- bin/*
SupportedStyles:
- never
# `always` will always add the frozen string literal comment to a file
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.1
2.7.5
29 changes: 15 additions & 14 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,33 @@

source "https://rubygems.org"

DECIDIM_VERSION = "release/0.25-stable"
DECIDIM_VERSION = "release/0.26-stable"

ruby RUBY_VERSION

gem "decidim", git: "https://github.com/decidim/decidim.git", branch: DECIDIM_VERSION
gem "decidim-conferences", git: "https://github.com/decidim/decidim.git", branch: DECIDIM_VERSION

gem "acts_as_textcaptcha", "~> 4.5.1"
gem "bootsnap", "~> 1.4"
# gem "acts_as_textcaptcha", "~> 4.5.1"
gem "decidim-decidim_awesome"
gem "decidim-homepage_interactive_map", git: "https://github.com/OpenSourcePolitics/decidim-module-homepage_interactive_map.git", branch: "bump/0.25-stable"
gem "decidim-phone_authorization_handler", git: "https://github.com/OpenSourcePolitics/decidim-module_phone_authorization_handler", branch: "bump/0.25-stable"
gem "decidim-question_captcha", git: "https://github.com/OpenSourcePolitics/decidim-module-question_captcha.git", branch: DECIDIM_VERSION
gem "decidim-spam_detection"
gem "decidim-friendly_signup", git: "https://github.com/OpenSourcePolitics/decidim-module-friendly_signup.git"
gem "decidim-homepage_interactive_map", git: "https://github.com/OpenSourcePolitics/decidim-module-homepage_interactive_map.git", branch: DECIDIM_VERSION
gem "decidim-phone_authorization_handler", git: "https://github.com/OpenSourcePolitics/decidim-module_phone_authorization_handler", branch: DECIDIM_VERSION
# gem "decidim-question_captcha", git: "https://github.com/OpenSourcePolitics/decidim-module-question_captcha.git", branch: DECIDIM_VERSION
gem "decidim-spam_detection", git: "https://github.com/OpenSourcePolitics/decidim-spam_detection.git"
gem "decidim-templates"
gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer.git", branch: "release/0.25-stable"
gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer.git"
gem "omniauth-france_connect", git: "https://github.com/OpenSourcePolitics/omniauth-france_connect"
gem "omniauth-publik", git: "https://github.com/OpenSourcePolitics/omniauth-publik", branch: "v0.0.9"

gem "dotenv-rails"

gem "bootsnap", "~> 1.4"
gem "foundation_rails_helper", git: "https://github.com/sgruhier/foundation_rails_helper.git"
gem "puma", "~> 5.5.1"

gem "faker", "~> 2.14"
gem "puma", ">= 5.5.1"

gem "ruby-progressbar"

gem "letter_opener_web", "~> 1.3"
gem "faker", "~> 2.14"

gem "activejob-uniqueness", require: "active_job/uniqueness/sidekiq_patch"
gem "fog-aws"
Expand All @@ -40,15 +39,17 @@ gem "omniauth-rails_csrf_protection", "~> 1.0"
group :development, :test do
gem "byebug", "~> 11.0", platform: :mri

gem "brakeman", "~> 5.1"
gem "decidim-dev", git: "https://github.com/decidim/decidim.git", branch: DECIDIM_VERSION
end

group :development do
gem "letter_opener_web", "~> 1.3"
gem "listen", "~> 3.1"
gem "rubocop-faker"
gem "spring", "~> 2.0"
gem "spring-watcher-listen", "~> 2.0"
gem "web-console", "~> 3.5"
gem "web-console", "4.0.4"
end

group :production do
Expand Down
Loading

0 comments on commit a7fe3e1

Please sign in to comment.