Skip to content

Commit db168e6

Browse files
committed
Rip out bootboot, pending test and hacky test fix
1 parent 57b4803 commit db168e6

17 files changed

+128
-734
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.6
1+
3.2.2

.ruby-version-current

Lines changed: 0 additions & 1 deletion
This file was deleted.

.ruby-version-next

Lines changed: 0 additions & 1 deletion
This file was deleted.

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
nodejs 12.22.6
2-
ruby 3.0.6
2+
ruby 3.2.2
33
postgres 12.8
44
mongodb 4.4.9
55
redis 6.2.3

.tool-versions-current

Lines changed: 0 additions & 5 deletions
This file was deleted.

.tool-versions-next

Lines changed: 0 additions & 5 deletions
This file was deleted.

backend/Gemfile

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,21 @@
11
source "https://rubygems.org"
2-
plugin "bootboot", "~> 0.2.1"
32

4-
if ENV["DEPENDENCIES_NEXT"]
5-
ruby "3.2.2"
6-
else
7-
ruby "3.0.6"
8-
end
3+
ruby "3.2.2"
94

105
# Configuration management. keep on top of Gemfile
116
gem "dotenv-rails", groups: %i[development test]
127

138
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
14-
if ENV["DEPENDENCIES_NEXT"]
15-
gem "rails", "~> 7.0.5.1"
16-
else
17-
gem "rails", "~> 6.1.7.4"
18-
end
9+
gem "rails", "~> 7.0.1"
10+
1911
gem "rake"
2012

2113
# JSON serializer
2214
gem "active_model_serializers", "0.9.8"
2315

2416
# Use postgresql and mongo as the database for Active Record
25-
if ENV["DEPENDENCIES_NEXT"]
26-
gem "mongoid", "8.1.1"
27-
else
28-
gem "mongoid", "7.3.3"
29-
end
17+
gem "mongoid", "8.1.1"
18+
3019

3120
gem "pg", "1.5.3"
3221

@@ -36,11 +25,8 @@ gem "puma", "5.6.4"
3625
# Authentication libraries
3726
gem "cancancan", "~> 3.3.0"
3827
gem "cancancan-mongoid", "2.0.0"
39-
if ENV["DEPENDENCIES_NEXT"]
40-
gem "devise", "4.9.2"
41-
else
42-
gem "devise", "4.8.0"
43-
end
28+
gem "devise", "4.9.2"
29+
4430
gem "devise_invitable", "2.0.5"
4531
gem "omniauth", "1.8.1"
4632
gem "omniauth-facebook", "9.0.0"
@@ -83,9 +69,6 @@ gem "simplecov", require: false, group: :test
8369

8470
group :development, :test do
8571
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
86-
unless ENV["DEPENDENCIES_NEXT"]
87-
gem "bullet"
88-
end
8972
gem "byebug"
9073
gem "database_cleaner"
9174
gem "database_cleaner-mongoid"
@@ -124,11 +107,3 @@ end
124107
gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
125108

126109
gem "bugsnag", "~> 6.22"
127-
Plugin.send(:load_plugin, "bootboot") if Plugin.installed?("bootboot")
128-
129-
if ENV["DEPENDENCIES_NEXT"]
130-
enable_dual_booting if Plugin.installed?("bootboot")
131-
132-
# Add any gem you want here, they will be loaded only when running
133-
# bundler command prefixed with `DEPENDENCIES_NEXT=1`.
134-
end

0 commit comments

Comments
 (0)