diff --git a/Gemfile b/Gemfile index a819b7bf8e..5f4c108450 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby '>= 3.3' -gem 'active_model_serializers', '>= 0.10.14' +gem 'active_model_serializers', '>= 0.10.15' gem 'active_storage_validations', '>= 1.3.4' gem 'aws-sdk-s3', require: false gem 'bcrypt', '~> 3.1.7' @@ -17,10 +17,9 @@ gem 'data_migrate', '>= 11.2' gem 'dotenv-rails' gem 'google-cloud-storage', '~> 1.44', require: false gem 'hcaptcha' -gem 'hiredis', '~> 0.6.0' gem 'i18n-language-mapping' gem 'image_processing', '~> 1.2' -gem 'jbuilder' +gem 'jbuilder', '>= 2.12' gem 'jsbundling-rails', '>= 1.2.2' gem 'jwt' gem 'mini_magick', '>= 4.9.5' @@ -31,9 +30,9 @@ gem 'omniauth_openid_connect', '>= 0.6.1' gem 'omniauth-rails_csrf_protection', '~> 1.0.2' gem 'pagy', '~> 6.0', '>= 6.0.0' gem 'pg' -gem 'puma', '~> 5.6' +gem 'puma', '~> 6.4' gem 'rails', '~> 7.2.2' -gem 'redis', '~> 4.0' +gem 'redis', '~> 4.8.0' gem 'sprockets-rails', '>= 3.5.0' gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby] diff --git a/Gemfile.lock b/Gemfile.lock index 42f04ca3ca..be878cc1b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,7 +45,7 @@ GEM erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - active_model_serializers (0.10.14) + active_model_serializers (0.10.15) actionpack (>= 4.1) activemodel (>= 4.1) case_transform (>= 0.2) @@ -213,7 +213,6 @@ GEM hashie (5.0.0) hcaptcha (7.1.0) json - hiredis (0.6.3) httpclient (2.8.3) i18n (1.14.6) concurrent-ruby (~> 1.0) @@ -225,7 +224,7 @@ GEM irb (1.14.1) rdoc (>= 4.0.0) reline (>= 0.4.2) - jbuilder (2.11.5) + jbuilder (2.13.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) jmespath (1.6.2) @@ -316,7 +315,7 @@ GEM psych (5.1.2) stringio public_suffix (5.0.3) - puma (5.6.8) + puma (6.5.0) nio4r (~> 2.0) racc (1.8.1) rack (2.2.10) @@ -506,7 +505,7 @@ PLATFORMS x86_64-linux DEPENDENCIES - active_model_serializers (>= 0.10.14) + active_model_serializers (>= 0.10.15) active_storage_validations (>= 1.3.4) aws-sdk-s3 bcrypt (~> 3.1.7) @@ -523,10 +522,9 @@ DEPENDENCIES faker google-cloud-storage (~> 1.44) hcaptcha - hiredis (~> 0.6.0) i18n-language-mapping image_processing (~> 1.2) - jbuilder + jbuilder (>= 2.12) jsbundling-rails (>= 1.2.2) jwt lograge (~> 0.14.0) @@ -537,9 +535,9 @@ DEPENDENCIES omniauth_openid_connect (>= 0.6.1) pagy (~> 6.0, >= 6.0.0) pg - puma (~> 5.6) + puma (~> 6.4) rails (~> 7.2.2) - redis (~> 4.0) + redis (~> 4.8.0) remote_syslog_logger rspec-rails (~> 7.1) rubocop (~> 1.26) diff --git a/app/models/user.rb b/app/models/user.rb index 53d724191c..96d7219d1c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -35,7 +35,7 @@ class User < ApplicationRecord has_one_attached :avatar - enum status: { active: 0, pending: 1, banned: 2 } + enum :status, { active: 0, pending: 1, banned: 2 } validates :name, presence: true, length: { minimum: 1, maximum: 255 } # TODO: amir - Change into full_name or seperate first and last name.