Merge branch 'dev' for release 6.0.0

.dockerignore

@@ -1,5 +1,6 @@
 # Ignore bundler config.
 config/database.yml
+config/auth_provider.yml
 
 # Ignore database files.
 postgresql

.gitignore

@@ -26,6 +26,7 @@
 # Ignore application configurations
 /config/application.yml
 /config/database.yml
+/config/auth_provider.yml
 .env
 
 *.DS_Store

.nvmrc

@@ -1 +1 @@
-16.13.2
+18.15.0

.rubocop.yml

@@ -6,6 +6,8 @@ Layout/LineLength:
   Max: 145
 Metrics/MethodLength:
   Max: 35
+  Exclude:
+    - 'app/pdfs/pdf/*.rb'
 Metrics/CyclomaticComplexity:
   Max: 14
 Metrics/PerceivedComplexity:
@@ -19,6 +21,7 @@ Metrics/BlockLength:
   Exclude:
     - 'lib/tasks/**/*.rake'
     - 'config/routes.rb'
+    - 'config/environments/*.rb'
     - 'app/pdfs/pdf/*.rb'
     - 'test/**/*.rb'
     - '**/*_concern.rb'
@@ -38,6 +41,8 @@ Rails/RedundantPresenceValidationOnBelongsTo:
   Enabled: false
 Style/DateTime:
   Enabled: true
+Style/HashSyntax:
+  EnforcedShorthandSyntax: never
 Rails/TimeZone:
   Enabled: true
 Rails/UnknownEnv:

.ruby-version

@@ -1 +1 @@
-ruby-2.6.10
+ruby-3.2.1

CHANGELOG.md

@@ -1,5 +1,42 @@
 # Changelog Fab-manager
 
+## v6.0.0 2023 April 03
+
+- Updated ruby to 3.2
+- Updated rails to 7.0
+- Updated puma to 6.1
+- Updated responders to 3.0
+- Updated devise to 4.9
+- Updated sassc to 2.4
+- Updated sentry to 5.8
+- Updated web-console to 4.2
+- Updated shakapacker to 6.6
+- Updated bootsnap to 1.16
+- Updated pg to 1.4
+- Updated nodejs to 18.15
+- Updated oj to 3.14
+- Updated multi_json to 1.15
+- Updated spring to 4.0
+- Updated spring-watcher-listen to 2.1
+- Updated omniauth to 2.1
+- Updated omniauth-rails_csrf_protection to 1.0
+- Updated omniauth_openid_connect to 0.6
+- Updated the invoices chaining method with a more flexible model
+- Fill the holes in the logical sequence of invoices references with nil invoices
+- Use a cached configuration file to read the authentication provider settings
+- Order numbers are now saved in database instead of generated on-the-fly
+- OpenAPI availabilities endpoint
+- Ability to filter OpenAPI reservations endpoint by availability_id
+- Support for ARM64 CPU architecture
+- Fix a bug: by default, invoices should be ordered by date descending
+- Fix a bug: broken display after a plan category was deleted
+- Fix a bug: unable to update recurring event
+- Fix a security issue: updated json5 to 2.2.2 to fix [CVE-2022-46175](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-46175)
+- Fix a security issue: updated terser to 5.16.8 to fix [CVE-2022-25858](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-25858)
+- [TODO DEPLOY] `\curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/scripts/mount-auth-provider.sh | bash`
+- [TODO DEPLOY] `rails fablab:auth:write_provider`
+- [TODO DEPLOY] `rails fablab:restore_order_number` THEN `rails fablab:fix_references`
+
 ## v5.9.1 2023 March 22
 
 - Fix a bug: logical sequence of invoices references has duplicates

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.6.10-alpine
+FROM ruby:3.2.1-alpine
 MAINTAINER contact@fab-manager.com
 
 # Install upgrade system packages

Gemfile

@@ -3,12 +3,18 @@
 source 'https://rubygems.org'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.2.8'
+gem 'rails', '~> 7.0'
 # Used by rails 5.2 to reduce the app boot time by over 50%
 gem 'bootsnap'
 # Use Puma as web server
-gem 'puma', '4.3.12'
-gem 'shakapacker', '6.5.5'
+gem 'puma', '6.1.0'
+gem 'shakapacker', '6.6.0'
+
+# rails 6 compatibility with ruby 3 (may not be required after upgrade to rails 7)
+gem 'matrix'
+gem 'net-imap', require: false
+gem 'net-pop', require: false
+gem 'net-smtp', require: false
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.5'
@@ -17,7 +23,7 @@ gem 'json', '>= 2.3.0'
 gem 'jsonpath'
 
 gem 'forgery'
-gem 'responders', '~> 2.0'
+gem 'responders', '~> 3.0'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
@@ -33,26 +39,26 @@ group :development do
   gem 'bullet'
   gem 'coveralls_reborn', '~> 0.18.0', require: false
   gem 'foreman'
-  gem 'web-console', '>= 3.3.0'
+  gem 'web-console', '>= 4.2.0'
   # Preview mail in the browser
   gem 'listen', '~> 3.0.5'
   gem 'overcommit'
+  gem 'pry'
   gem 'rb-readline'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'railroady'
   gem 'rubocop', '~> 1.31', require: false
   gem 'rubocop-rails', require: false
-  gem 'spring'
-  gem 'spring-watcher-listen', '~> 2.0.0'
+  gem 'spring', '~> 4'
+  gem 'spring-watcher-listen', '~> 2.1.0'
 end
 
 group :test do
   gem 'database_cleaner'
   gem 'faker'
   gem 'minitest-reporters'
-  gem 'pdf-reader'
   gem 'rubyXL'
-  gem 'vcr', '6.0.0'
+  gem 'vcr', '~> 6.1.0'
   gem 'webmock'
 end
 
@@ -62,11 +68,11 @@ gem 'pg'
 gem 'pg_search'
 
 # authentication
-gem 'devise', '>= 4.6.0'
-gem 'omniauth', '~> 1.9.2'
+gem 'devise', '>= 4.9'
+gem 'omniauth', '~> 2.1'
 gem 'omniauth-oauth2'
 gem 'omniauth_openid_connect'
-gem 'omniauth-rails_csrf_protection', '~> 0.1'
+gem 'omniauth-rails_csrf_protection', '~> 1.0'
 
 gem 'rolify'
 
@@ -95,6 +101,7 @@ gem 'stripe', '5.29.0'
 gem 'recurrence'
 
 # PDF
+gem 'pdf-reader'
 gem 'prawn'
 gem 'prawn-table'
 
@@ -107,9 +114,6 @@ gem 'pundit'
 
 gem 'oj'
 
-gem 'actionpack-page_caching', '1.2.2'
-gem 'rails-observers'
-
 gem 'chroma'
 
 gem 'message_format'
@@ -136,7 +140,7 @@ gem 'icalendar'
 gem 'tzinfo-data'
 
 # compilation of dynamic stylesheets (home page & theme)
-gem 'sassc', '= 2.1.0'
+gem 'sassc', '= 2.4.0'
 
 gem 'redis-session-store'