Merge branch 'staging'

2023-01-16 21:53:56 +02:00
parent 81a475a991 54a42fbfb2
commit 8adbb6d4a4
64 changed files with 778 additions and 164 deletions
--- a/3
+++ b/3
@ -16,10 +16,11 @@ gem 'html2haml'
 gem 'devise'
 gem 'carrierwave', '>= 3.0.0.beta', '< 4.0'

+gem 'kaminari'
 gem "ruby2js" , git: "https://github.com/ruby2js/ruby2js/" , branch: "haml_fix"
 gem 'thredded', '~> 1.0'
 gem "rest-client"
-
+gem "pundit"

 gem "simple_form" , "5.1.0"
 gem "simple_form_tailwind_css"