Merge branch 'main' of https://github.com/solver-it-sro/govbox-pro in…

…to GO-293/forms_and_templates_core_domain # Conflicts: # app/controllers/message_drafts_controller.rb # app/models/message_draft.rb
slovensko-digital · Dec 7, 2023 · 220a031 · 220a031
2 parents fbd6ff6 + a835f27
commit 220a031
Show file tree

Hide file tree

Showing 112 changed files with 1,339 additions and 688 deletions.
diff --git a/.gitignore b/.gitignore
@@ -47,3 +47,6 @@ yarn-debug.log*
 !/app/assets/builds/.keep
 
 .DS_Store
+
+coverage
+
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -14,5 +14,7 @@ Style/Lambda:
   Enabled: false
 Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
+Style/ExplicitBlockArgument:
+  Enabled: false
 Rails/Validation:
   Enabled: false
diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,2 @@
 ruby 3.2.2
-nodejs 18.13.0
+nodejs 20.10.0
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -24,5 +24,8 @@
   },
   "[markdown]": {
     "editor.defaultFormatter": null
+  },
+  "[ruby]": {
+    "editor.defaultFormatter": "Shopify.ruby-lsp"
   }
 }
diff --git a/Gemfile b/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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,3 +47,6 @@ yarn-debug.log*
		!/app/assets/builds/.keep

		.DS_Store

		coverage