Merge branch 'main' into GO-385-upravit-modal-pre-vyber-tagov

.gitignore

@@ -47,3 +47,6 @@ yarn-debug.log*
 !/app/assets/builds/.keep
 
 .DS_Store
+
+coverage
+

.gitlab/auto-deploy-values.yaml

@@ -12,15 +12,13 @@ ingress:
 livenessProbe:
   initialDelaySeconds: 5
   timeoutSeconds: 5
-  probeType: "exec"
-  command:
-    - "true"
+  probeType: "httpGet"
+  path: "/health"
 readinessProbe:
   initialDelaySeconds: 5
   timeoutSeconds: 10
-  probeType: "exec"
-  command:
-    - "true"
+  probeType: "httpGet"
+  path: "/health"
 resources:
   requests:
     memory: 600Mi

.gitlab/prod-auto-deploy-values.yaml

@@ -12,15 +12,13 @@ ingress:
 livenessProbe:
   initialDelaySeconds: 5
   timeoutSeconds: 5
-  probeType: "exec"
-  command:
-    - "true"
-readinessProbe:
+  probeType: "httpGet"
+  path: "/health"
+eadinessProbe:
   initialDelaySeconds: 5
   timeoutSeconds: 10
-  probeType: "exec"
-  command:
-    - "true"
+  probeType: "httpGet"
+  path: "/health"
 resources:
   requests:
     memory: 700Mi

.rubocop.yml

@@ -12,3 +12,9 @@ Style/WordArray:
   Enabled: false
 Style/Lambda:
   Enabled: false
+Style/StringLiteralsInInterpolation:
+  EnforcedStyle: double_quotes
+Style/ExplicitBlockArgument:
+  Enabled: false
+Rails/Validation:
+  Enabled: false

.tool-versions

@@ -1,2 +1,2 @@
 ruby 3.2.2
-nodejs 18.13.0
+nodejs 20.10.0

.vscode/settings.json

@@ -21,5 +21,11 @@
   ],
   "[erb]": {
     "editor.defaultFormatter": "Jota0222.multi-formatter"
+  },
+  "[markdown]": {
+    "editor.defaultFormatter": null
+  },
+  "[ruby]": {
+    "editor.defaultFormatter": "Shopify.ruby-lsp"
   }
 }

Gemfile

@@ -2,13 +2,13 @@ source 'https://rubygems.org'
 
 ruby '3.2.2'
 
-gem 'rails', '~> 7.0'
+gem 'rails', '~> 7.1'
 gem 'rails-i18n'
 
 gem 'pg', '~> 1.0'
 gem 'with_advisory_lock'
 
-gem 'puma', '~> 5.0'
+gem 'puma', '~> 6.0'
 
 gem 'turbo-rails'
 
@@ -75,4 +75,5 @@ group :test do
   gem 'capybara'
   gem 'capybara-screenshot'
   gem 'webmock'
+  gem 'simplecov', require: false
 end