Skip to content

Commit

Permalink
Merge pull request #726 from dxw/maintenance
Browse files Browse the repository at this point in the history
Maintenance
  • Loading branch information
yndajas authored Jun 26, 2024
2 parents 3dffea1 + b2ce561 commit 49069ae
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 31 deletions.
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@
*.gz
/public/assets/*
/coverage
.ruby-lsp/
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ gem "lograge", "~> 0.12"
gem "pg"
gem "pry-rails"
gem "mini_racer"
gem "puma", "~> 5.6"
gem "puma", "~> 6.4"
gem "rollbar"
gem "rails", "~> 7.0"
gem "sass-rails", "~> 6.0"
Expand Down
61 changes: 36 additions & 25 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ GEM
autoprefixer-rails (>= 9.1.0)
popper_js (>= 2.11.8, < 3)
brakeman (5.4.1)
builder (3.2.4)
builder (3.3.0)
bullet (7.1.6)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
Expand Down Expand Up @@ -133,7 +133,7 @@ GEM
dotenv (= 2.8.1)
railties (>= 3.2)
drb (2.2.1)
erubi (1.12.0)
erubi (1.13.0)
execjs (2.9.1)
factory_bot (6.4.5)
activesupport (>= 5.0.0)
Expand All @@ -148,7 +148,10 @@ GEM
high_voltage (3.1.2)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
irb (0.9.6)
io-console (0.7.2)
irb (1.13.2)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jbuilder (2.12.0)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
Expand Down Expand Up @@ -187,7 +190,7 @@ GEM
mini_mime (1.1.5)
mini_racer (0.6.4)
libv8-node (~> 16.19.0.0)
minitest (5.22.3)
minitest (5.24.0)
msgpack (1.7.2)
mutex_m (0.2.0)
net-imap (0.4.13)
Expand Down Expand Up @@ -217,18 +220,20 @@ GEM
method_source (~> 1.0)
pry-rails (0.3.11)
pry (>= 0.13.0)
psych (5.1.2)
stringio
public_suffix (5.0.5)
puma (5.6.8)
puma (6.4.2)
nio4r (~> 2.0)
racc (1.8.0)
rack (2.2.9)
rack-session (1.0.2)
rack (< 3)
rack (3.1.4)
rack-session (2.0.0)
rack (>= 3.0.0)
rack-test (2.1.0)
rack (>= 1.3)
rackup (1.0.0)
rack (< 3)
webrick
rackup (2.1.0)
rack (>= 3)
webrick (~> 1.8)
rails (7.1.3.4)
actioncable (= 7.1.3.4)
actionmailbox (= 7.1.3.4)
Expand Down Expand Up @@ -260,34 +265,38 @@ GEM
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.1.0)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdoc (6.7.0)
psych (>= 4.0.0)
regexp_parser (2.9.2)
reline (0.5.9)
io-console (~> 0.5)
request_store (1.5.1)
rack (>= 1.4)
rexml (3.3.1)
strscan
rollbar (3.5.2)
rouge (1.11.1)
rspec-core (3.12.3)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.4)
rspec-core (3.13.0)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.7)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-rails (6.1.1)
rspec-support (~> 3.13.0)
rspec-rails (6.1.3)
actionpack (>= 6.1)
activesupport (>= 6.1)
railties (>= 6.1)
rspec-core (~> 3.12)
rspec-expectations (~> 3.12)
rspec-mocks (~> 3.12)
rspec-support (~> 3.12)
rspec-support (3.12.2)
rspec-core (~> 3.13)
rspec-expectations (~> 3.13)
rspec-mocks (~> 3.13)
rspec-support (~> 3.13)
rspec-support (3.13.1)
rubocop (1.64.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
Expand Down Expand Up @@ -350,6 +359,7 @@ GEM
standard-performance (1.4.0)
lint_roller (~> 1.1)
rubocop-performance (~> 1.21.0)
stringio (3.1.1)
strscan (3.1.0)
thor (1.3.1)
tilt (2.3.0)
Expand Down Expand Up @@ -379,6 +389,7 @@ GEM

PLATFORMS
arm64-darwin-22
arm64-darwin-23
x86_64-darwin-21
x86_64-linux

Expand All @@ -405,7 +416,7 @@ DEPENDENCIES
mini_racer
pg
pry-rails
puma (~> 5.6)
puma (~> 6.4)
rails (~> 7.0)
rails_layout
rollbar
Expand Down
2 changes: 1 addition & 1 deletion config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class Application < Rails::Application
end

# Initialize configuration defaults for originally generated Rails version.
config.load_defaults 6.0
config.load_defaults 7.0

# Configuration for the application, engines, and railties goes here.
#
Expand Down
2 changes: 1 addition & 1 deletion config/environments/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.

config.cache_classes = true
config.cache_classes = false

# Do not eager load code on boot. This avoids loading your whole application
# just for the purpose of running a single test. If you are using a tool that
Expand Down
4 changes: 2 additions & 2 deletions script/no-docker/setup
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ set -e

if [ -z "$CI" ] && [ "$DB_DROP_RESULT" != 0 ]; then
printf "\\nDatabase drop failed. Continue anyway? [y/N] "
read -r
read -r REPLY

case $REPLY in
y | Y)
Expand All @@ -46,7 +46,7 @@ set -e

if [ -z "$CI" ] && [ "$DB_DROP_RESULT" != 0 ]; then
printf "\\nDatabase drop failed. Continue anyway? [y/N] "
read -r
read -r REPLY

case $REPLY in
y | Y)
Expand Down
2 changes: 1 addition & 1 deletion spec/rails_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
end
RSpec.configure do |config|
# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
config.fixture_path = "#{::Rails.root}/spec/fixtures"
config.fixture_paths = ["#{::Rails.root}/spec/fixtures"]

# If you're not using ActiveRecord, or you'd prefer not to run each of your
# examples within a transaction, remove the following line or assign false
Expand Down

0 comments on commit 49069ae

Please sign in to comment.