Continuous Release 1.12.0

Merge pull request #624 from MaMpf-HD/dev

.erb-lint.yml → .config/.erb-lint.yml

@@ -1,3 +1,4 @@
+# Not used right now
 ---
 EnableDefaultLinters: true
 linters:

.rubocop.yml → .config/.rubocop.yml

@@ -105,7 +105,7 @@ Style/MethodCallWithArgsParentheses:
   AllowedPatterns: [^redirect_]
   # Don't enforce in migrations, as we have methods like `add_column`,
   # `change_column` etc. and parentheses would be very annoying there.
-  Exclude: ["db/**/*"]
+  Exclude: ["../db/**/*"]
 
 Style/RedundantReturn:
   AllowMultipleReturnValues: true

.config/README.md

@@ -0,0 +1,6 @@
+# Config settings
+
+This directory contains configuration files for the project according to the [`.config/` directory proposal](https://github.com/pi0/config-dir).
+
+Note that we currently don't use these files (but might in the near future):
+- `.erb-lint.myl`

eslint.config.mjs → .config/eslint.mjs

@@ -96,7 +96,7 @@ export default [
   js.configs.recommended,
   // Allow linting of ERB files, see https://github.com/Splines/eslint-plugin-erb
   erb.configs.recommended,
-  // Globally ignore the following files
+  // Globally ignore the following paths
   {
     ignores: [
       "node_modules/",

.dockerignore

@@ -3,7 +3,6 @@ docker/developement/Dockerfile
 docker/run_tests/docker-compose.yml
 docker/run_tests/Dockerfile
 **/.git
-.travis*
 LICENSE
 README.md
 mampf-gui-transparent.png

.github/workflows/linter.yml

@@ -72,4 +72,4 @@ jobs:
           if: ${{ steps.js-changed.outputs.changed-files != ''}}
           run: |
             echo "🚨 Running ESLint version: $(yarn run --silent eslint --version)"
-            yarn run eslint --max-warnings 0 --no-warn-ignored ${{ steps.js-changed.outputs.changed-files }}
+            yarn run eslint --config ./.config/eslint.mjs --max-warnings 0 --no-warn-ignored ${{ steps.js-changed.outputs.changed-files }}

.gitignore

@@ -43,7 +43,6 @@ coverage
 /public/uploads
 
 # Ignore environment variables
-/config/app_environment_variables.rb
 completed_initial_run
 /public/uploads.zip
 /public/pdfcomprezzor/pdfcomprezzor.wasm

.vscode/settings.json

@@ -16,6 +16,9 @@
     "eslint.experimental.useFlatConfig": true,
     // this disables VSCode built-in formatter (instead we want to use ESLint)
     "javascript.validate.enable": false,
+    "eslint.options": {
+        "overrideConfigFile": ".config/eslint.mjs"
+    },
     //////////////////////////////////////
     // HTML
     //////////////////////////////////////
@@ -30,7 +33,9 @@
         "editor.formatOnSave": true
     },
     "rubyLsp.formatter": "rubocop",
-    "rubyLsp.rubyVersionManager": "rbenv",
+    "rubyLsp.rubyVersionManager": {
+        "identifier": "rbenv"
+    },
     "rubyLsp.enabledFeatures": {
         "codeActions": true,
         "diagnostics": true,
@@ -89,6 +94,8 @@
     //////////////////////////////////////
     "cSpell.words": [
         "commontator",
+        "helpdesk",
         "turbolinks"
-    ]
+    ],
+    "rubyLsp.customRubyCommand": "set -o allexport && . ./docker-dummy.env && set +o allexport"
 }

Gemfile

@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby "3.1.4"
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem "rails", "~> 7.0.4.3"
+gem "rails", "~> 7.1.3"
 # Use dalli for caching to memcached in production
 gem "dalli", ">= 2.7"
 # Ruby wrapper for UglifyJS JavaScript compressor
@@ -70,14 +70,14 @@ gem "erubis"
 gem "exception_handler", "~> 0.8.0.0"
 gem "faraday", "~> 1.8"
 gem "fuzzy-string-match"
-gem "globalize"
-gem "globalize-accessors"
+gem "html-pipeline", "~> 2.14"
 gem "jquery-rails"
 gem "jquery-ui-rails"
 gem "js-routes", "1.4.9"
 gem "kaminari"
 gem "kaminari-i18n"
 gem "kramdown-parser-gfm"
+gem "mobility"
 gem "net-smtp"
 gem "pg"
 gem "premailer-rails"
@@ -104,16 +104,16 @@ gem "trix-rails", require: "trix"
 gem "webpacker", "~> 5.x"
 
 group :development, :docker_development do
-  # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
-  gem "listen", ">= 3.0.5", "< 3.2"
+  gem "listen", "~> 3.9"
   gem "rails-erd"
+  # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem "web-console", ">= 3.3.0"
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem "marcel"
   gem "pgreset"
-  gem "rubocop", "~> 1.57", require: false
-  gem "rubocop-performance", "~> 1.16", require: false
-  gem "rubocop-rails", "~> 2.22", ">= 2.22.1", require: false
+  gem "rubocop", "~> 1.63", require: false
+  gem "rubocop-performance", "~> 1.21", require: false
+  gem "rubocop-rails", "~> 2.24", require: false
   gem "spring"
   gem "spring-watcher-listen", "~> 2.0.0"
   #  gem 'bullet'