Skip to content
Snippets Groups Projects
Unverified Commit 317044ac authored by ArtOfCode's avatar ArtOfCode Committed by GitHub
Browse files

Merge pull request #874 from eip-ewi/ruby-3

parents 027c668a 3c702af1
No related branches found
No related tags found
1 merge request!24Release 22-09-2022
Show whitespace changes
Inline Side-by-side
Gemfile
+ 5
− 2
View file @ 317044ac
source 'https://rubygems.org' source 'https://rubygems.org'
ruby '2.7.6' ruby '>= 2.7', '< 4'
# Essential gems: servers, adapters, Rails + Rails requirements # Essential gems: servers, adapters, Rails + Rails requirements
gem 'coffee-rails', '~> 5.0.0' gem 'coffee-rails', '~> 5.0.0'
...@@ -21,7 +21,7 @@ gem 'tzinfo-data', '~> 1.2022.3' ...@@ -21,7 +21,7 @@ gem 'tzinfo-data', '~> 1.2022.3'
# Sign in # Sign in
gem 'devise', '~> 4.8' gem 'devise', '~> 4.8'
gem 'omniauth', '~> 1.9' gem 'omniauth', '~> 2.1'
# Markdown support in both directions. # Markdown support in both directions.
gem 'commonmarker', '~> 0.23' gem 'commonmarker', '~> 0.23'
...@@ -62,6 +62,9 @@ gem 'stackprof', '~> 0.2' ...@@ -62,6 +62,9 @@ gem 'stackprof', '~> 0.2'
gem 'e2mmap', '~> 0.1' gem 'e2mmap', '~> 0.1'
gem 'thwait', '~> 0.2' gem 'thwait', '~> 0.2'
# Ruby 3.0 compatibility: net-smtp is no longer bundled with Ruby
gem 'net-smtp', '~> 0.3'
# Stuff for imports # Stuff for imports
gem 'ruby-progressbar', '~> 1.11' gem 'ruby-progressbar', '~> 1.11'
......
Gemfile.lock
+ 67
− 64
View file @ 317044ac
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (7.0.3.1) actioncable (7.0.4)
actionpack (= 7.0.3.1) actionpack (= 7.0.4)
activesupport (= 7.0.3.1) activesupport (= 7.0.4)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailbox (7.0.3.1) actionmailbox (7.0.4)
actionpack (= 7.0.3.1) actionpack (= 7.0.4)
activejob (= 7.0.3.1) activejob (= 7.0.4)
activerecord (= 7.0.3.1) activerecord (= 7.0.4)
activestorage (= 7.0.3.1) activestorage (= 7.0.4)
activesupport (= 7.0.3.1) activesupport (= 7.0.4)
mail (>= 2.7.1) mail (>= 2.7.1)
net-imap net-imap
net-pop net-pop
net-smtp net-smtp
actionmailer (7.0.3.1) actionmailer (7.0.4)
actionpack (= 7.0.3.1) actionpack (= 7.0.4)
actionview (= 7.0.3.1) actionview (= 7.0.4)
activejob (= 7.0.3.1) activejob (= 7.0.4)
activesupport (= 7.0.3.1) activesupport (= 7.0.4)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
net-imap net-imap
net-pop net-pop
net-smtp net-smtp
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (7.0.3.1) actionpack (7.0.4)
actionview (= 7.0.3.1) actionview (= 7.0.4)
activesupport (= 7.0.3.1) activesupport (= 7.0.4)
rack (~> 2.0, >= 2.2.0) rack (~> 2.0, >= 2.2.0)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.3.1) actiontext (7.0.4)
actionpack (= 7.0.3.1) actionpack (= 7.0.4)
activerecord (= 7.0.3.1) activerecord (= 7.0.4)
activestorage (= 7.0.3.1) activestorage (= 7.0.4)
activesupport (= 7.0.3.1) activesupport (= 7.0.4)
globalid (>= 0.6.0) globalid (>= 0.6.0)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (7.0.3.1) actionview (7.0.4)
activesupport (= 7.0.3.1) activesupport (= 7.0.4)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (7.0.3.1) activejob (7.0.4)
activesupport (= 7.0.3.1) activesupport (= 7.0.4)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (7.0.3.1) activemodel (7.0.4)
activesupport (= 7.0.3.1) activesupport (= 7.0.4)
activerecord (7.0.3.1) activerecord (7.0.4)
activemodel (= 7.0.3.1) activemodel (= 7.0.4)
activesupport (= 7.0.3.1) activesupport (= 7.0.4)
activestorage (7.0.3.1) activestorage (7.0.4)
actionpack (= 7.0.3.1) actionpack (= 7.0.4)
activejob (= 7.0.3.1) activejob (= 7.0.4)
activerecord (= 7.0.3.1) activerecord (= 7.0.4)
activesupport (= 7.0.3.1) activesupport (= 7.0.4)
marcel (~> 1.0) marcel (~> 1.0)
mini_mime (>= 1.1.0) mini_mime (>= 1.1.0)
activesupport (7.0.3.1) activesupport (7.0.4)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
minitest (>= 5.1) minitest (>= 5.1)
...@@ -71,8 +71,8 @@ GEM ...@@ -71,8 +71,8 @@ GEM
ast (2.4.2) ast (2.4.2)
awesome_print (1.9.2) awesome_print (1.9.2)
aws-eventstream (1.2.0) aws-eventstream (1.2.0)
aws-partitions (1.626.0) aws-partitions (1.628.0)
aws-sdk-core (3.140.0) aws-sdk-core (3.145.0)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0) aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
...@@ -201,9 +201,10 @@ GEM ...@@ -201,9 +201,10 @@ GEM
nio4r (2.5.8) nio4r (2.5.8)
nokogiri (1.13.8-x86_64-linux) nokogiri (1.13.8-x86_64-linux)
racc (~> 1.4) racc (~> 1.4)
omniauth (1.9.2) omniauth (2.1.0)
hashie (>= 3.4.6) hashie (>= 3.4.6)
rack (>= 1.6.2, < 3) rack (>= 2.2.3)
rack-protection
orm_adapter (0.5.0) orm_adapter (0.5.0)
parallel (1.22.1) parallel (1.22.1)
parser (3.1.2.1) parser (3.1.2.1)
...@@ -222,22 +223,24 @@ GEM ...@@ -222,22 +223,24 @@ GEM
rack (2.2.4) rack (2.2.4)
rack-mini-profiler (3.0.0) rack-mini-profiler (3.0.0)
rack (>= 1.2.0) rack (>= 1.2.0)
rack-protection (2.2.2)
rack
rack-test (2.0.2) rack-test (2.0.2)
rack (>= 1.3) rack (>= 1.3)
rails (7.0.3.1) rails (7.0.4)
actioncable (= 7.0.3.1) actioncable (= 7.0.4)
actionmailbox (= 7.0.3.1) actionmailbox (= 7.0.4)
actionmailer (= 7.0.3.1) actionmailer (= 7.0.4)
actionpack (= 7.0.3.1) actionpack (= 7.0.4)
actiontext (= 7.0.3.1) actiontext (= 7.0.4)
actionview (= 7.0.3.1) actionview (= 7.0.4)
activejob (= 7.0.3.1) activejob (= 7.0.4)
activemodel (= 7.0.3.1) activemodel (= 7.0.4)
activerecord (= 7.0.3.1) activerecord (= 7.0.4)
activestorage (= 7.0.3.1) activestorage (= 7.0.4)
activesupport (= 7.0.3.1) activesupport (= 7.0.4)
bundler (>= 1.15.0) bundler (>= 1.15.0)
railties (= 7.0.3.1) railties (= 7.0.4)
rails-controller-testing (1.0.5) rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1) actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1)
...@@ -247,9 +250,9 @@ GEM ...@@ -247,9 +250,9 @@ GEM
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.4.3) rails-html-sanitizer (1.4.3)
loofah (~> 2.3) loofah (~> 2.3)
railties (7.0.3.1) railties (7.0.4)
actionpack (= 7.0.3.1) actionpack (= 7.0.4)
activesupport (= 7.0.3.1) activesupport (= 7.0.4)
method_source method_source
rake (>= 12.2) rake (>= 12.2)
thor (~> 1.0) thor (~> 1.0)
...@@ -259,9 +262,9 @@ GEM ...@@ -259,9 +262,9 @@ GEM
rb-fsevent (0.11.2) rb-fsevent (0.11.2)
rb-inotify (0.10.1) rb-inotify (0.10.1)
ffi (~> 1.0) ffi (~> 1.0)
redis (5.0.2) redis (5.0.4)
redis-client (~> 0.7) redis-client (>= 0.7.4)
redis-client (0.7.1) redis-client (0.8.0)
connection_pool connection_pool
regexp_parser (2.5.0) regexp_parser (2.5.0)
responders (3.0.1) responders (3.0.1)
...@@ -288,10 +291,10 @@ GEM ...@@ -288,10 +291,10 @@ GEM
unicode-display_width (>= 1.4.0, < 3.0) unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.21.0) rubocop-ast (1.21.0)
parser (>= 3.1.1.0) parser (>= 3.1.1.0)
rubocop-rails (2.15.2) rubocop-rails (2.16.0)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
rack (>= 1.1) rack (>= 1.1)
rubocop (>= 1.7.0, < 2.0) rubocop (>= 1.33.0, < 2.0)
ruby-progressbar (1.11.0) ruby-progressbar (1.11.0)
ruby-vips (2.1.4) ruby-vips (2.1.4)
ffi (~> 1.12) ffi (~> 1.12)
...@@ -358,7 +361,6 @@ GEM ...@@ -358,7 +361,6 @@ GEM
zeitwerk (2.6.0) zeitwerk (2.6.0)
PLATFORMS PLATFORMS
ruby
x86_64-linux x86_64-linux
DEPENDENCIES DEPENDENCIES
...@@ -386,7 +388,8 @@ DEPENDENCIES ...@@ -386,7 +388,8 @@ DEPENDENCIES
minitest (~> 5.16.0) minitest (~> 5.16.0)
minitest-ci (~> 3.4.0) minitest-ci (~> 3.4.0)
mysql2 (~> 0.5.4) mysql2 (~> 0.5.4)
omniauth (~> 1.9) net-smtp (~> 0.3)
omniauth (~> 2.1)
premailer-rails (~> 1.11) premailer-rails (~> 1.11)
puma (~> 5.6) puma (~> 5.6)
rack-mini-profiler (~> 3.0) rack-mini-profiler (~> 3.0)
......
app/models/request_context.rb
+ 6
− 1
View file @ 317044ac
...@@ -13,7 +13,12 @@ class RequestContext ...@@ -13,7 +13,12 @@ class RequestContext
$redis $redis
else else
processed = ERB.new(File.read(Rails.root.join('config', 'database.yml'))).result(binding) processed = ERB.new(File.read(Rails.root.join('config', 'database.yml'))).result(binding)
$redis ||= Redis.new(YAML.safe_load(processed, [], [], true)["redis_#{Rails.env}"].deep_symbolize_keys) $redis ||= Redis.new(
YAML.safe_load(processed,
permitted_classes: [],
permitted_symbols: [],
aliases: true)["redis_#{Rails.env}"].deep_symbolize_keys
)
end end
rescue NoMethodError rescue NoMethodError
raise LoadError, "You don't appear to have any Redis config in config/database.yml" raise LoadError, "You don't appear to have any Redis config in config/database.yml"
......
config/environments/development.rb
+ 1
− 1
View file @ 317044ac
...@@ -21,7 +21,7 @@ Rails.application.configure do ...@@ -21,7 +21,7 @@ Rails.application.configure do
# Set the cache store to the redis that was configured in the database.yml # Set the cache store to the redis that was configured in the database.yml
processed = ERB.new(File.read(Rails.root.join('config', 'database.yml'))).result(binding) processed = ERB.new(File.read(Rails.root.join('config', 'database.yml'))).result(binding)
redis_config = YAML.safe_load(processed, [], [], true)["redis_#{Rails.env}"] redis_config = YAML.safe_load(processed, permitted_classes: [], permitted_symbols: [], aliases: true)["redis_#{Rails.env}"]
config.cache_store = QPixel::NamespacedEnvCache.new( config.cache_store = QPixel::NamespacedEnvCache.new(
ActiveSupport::Cache::RedisCacheStore.new( ActiveSupport::Cache::RedisCacheStore.new(
url: "redis://#{redis_config['host']}:#{redis_config['port']}" url: "redis://#{redis_config['host']}:#{redis_config['port']}"
......
config/environments/test.rb
+ 1
− 1
View file @ 317044ac
...@@ -29,7 +29,7 @@ Rails.application.configure do ...@@ -29,7 +29,7 @@ Rails.application.configure do
config.action_controller.perform_caching = false config.action_controller.perform_caching = false
processed = ERB.new(File.read(Rails.root.join('config', 'database.yml'))).result(binding) processed = ERB.new(File.read(Rails.root.join('config', 'database.yml'))).result(binding)
redis_config = YAML.safe_load(processed, [], [], true)["redis_#{Rails.env}"] redis_config = YAML.safe_load(processed, permitted_classes: [], permitted_symbols: [], aliases: true)["redis_#{Rails.env}"]
config.cache_store = QPixel::NamespacedEnvCache.new( config.cache_store = QPixel::NamespacedEnvCache.new(
ActiveSupport::Cache::RedisCacheStore.new( ActiveSupport::Cache::RedisCacheStore.new(
url: "redis://#{redis_config['host']}:#{redis_config['port']}" url: "redis://#{redis_config['host']}:#{redis_config['port']}"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment