Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade to rails 3.3.3 #1001

Merged
merged 1 commit into from
Jul 4, 2024
+56 −52
Merged

upgrade to rails 3.3.3 #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.4
3.3.3
9 changes: 3 additions & 6 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,16 @@ source "http://rubygems.org"

gem "rails", "~> 7.1.0"

# Force some gems to older versions to prevent error in prod:
# "You have already activated base64 0.1.1, but your Gemfile requires base64 0.2.0. Since base64 is a default gem"
gem "base64", "0.1.1"
gem "stringio", "3.0.1.1"

# Misc
gem "attribute_normalizer", "~> 1.2"
gem "csv"
gem "daemons", "~> 1.2"
gem "descriptive_statistics", "~> 2.5", require: "descriptive_statistics/safe" # mean, median, etc.
gem "draper", "~> 4.0"
gem "eventmachine", "~> 1.2", platform: :ruby
gem "exception_notification", "~> 4.2"
gem "friendly_id", "~> 5.1"
gem "observer"
gem "phony", "~> 2.15"
gem "rack-attack", "~> 6.3"
gem "rake", "~> 13.0"
Expand Down Expand Up @@ -91,7 +88,7 @@ gem "acts_as_list"

# Caching
gem "actionpack-page_caching", "~> 1.1"
gem "bootsnap", "~> 1.4", require: false
gem "bootsnap", "~> 1.4", require: false, group: [:production]
gem "dalli", "~> 3.2"

# DB
Expand Down
97 changes: 52 additions & 45 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ GEM
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
acts_as_list (1.2.0)
acts_as_list (1.2.1)
activerecord (>= 6.1)
activesupport (>= 6.1)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
ancestry (4.3.3)
activerecord (>= 5.2.6)
annotate (3.2.0)
Expand All @@ -137,19 +137,19 @@ GEM
execjs (~> 2)
awesome_print (1.9.2)
aws-eventstream (1.3.0)
aws-partitions (1.938.0)
aws-sdk-core (3.196.1)
aws-partitions (1.950.0)
aws-sdk-core (3.201.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.82.0)
aws-sdk-core (~> 3, >= 3.193.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.151.0)
aws-sdk-core (~> 3, >= 3.194.0)
aws-sdk-kms (1.88.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.156.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.8)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.8.0)
aws-eventstream (~> 1, >= 1.0.2)
azure-storage-blob (2.0.3)
Expand All @@ -164,7 +164,7 @@ GEM
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
base64 (0.1.1)
base64 (0.2.0)
bigdecimal (3.1.8)
binding_of_caller (1.0.1)
debug_inspector (>= 1.2.0)
Expand All @@ -176,7 +176,7 @@ GEM
autoprefixer-rails (>= 9.1.0)
popper_js (>= 1.16.1, < 2)
sassc-rails (>= 2.0.0)
builder (3.2.4)
builder (3.3.0)
bullet (7.1.6)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
Expand Down Expand Up @@ -207,12 +207,13 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.3.1)
concurrent-ruby (1.3.3)
connection_pool (2.4.1)
crack (1.0.0)
bigdecimal
rexml
crass (1.0.6)
csv (3.3.0)
daemons (1.4.1)
dalli (3.2.8)
database_cleaner (2.0.2)
Expand Down Expand Up @@ -250,7 +251,7 @@ GEM
dropzonejs-rails (0.8.5)
rails (> 3.1)
ejs (1.1.1)
erubi (1.12.0)
erubi (1.13.0)
eventmachine (1.2.7)
exception_notification (4.5.0)
actionmailer (>= 5.2, < 8)
Expand Down Expand Up @@ -322,7 +323,7 @@ GEM
immigrant (0.3.6)
activerecord (>= 3.0)
io-console (0.7.2)
irb (1.13.1)
irb (1.13.2)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
iso-639 (0.3.6)
Expand All @@ -336,7 +337,7 @@ GEM
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.7.2)
jwt (2.8.1)
jwt (2.8.2)
base64
launchy (2.5.2)
addressable (~> 2.8)
Expand All @@ -358,18 +359,20 @@ GEM
method_source (1.1.0)
mime-types (3.5.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2024.0507)
mini_magick (4.12.0)
mime-types-data (3.2024.0702)
mini_magick (4.13.1)
mini_mime (1.1.5)
mini_portile2 (2.8.7)
minitest (5.23.1)
minitest (5.24.1)
mize (0.4.1)
protocol (~> 2.0)
mocha (1.16.1)
msgpack (1.7.2)
multipart-post (2.4.1)
mutex_m (0.2.0)
net-http-persistent (4.0.2)
connection_pool (~> 2.2)
net-imap (0.4.12)
net-imap (0.4.14)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -380,11 +383,12 @@ GEM
net-protocol
netrc (0.11.0)
nio4r (2.7.3)
nokogiri (1.16.5)
nokogiri (1.16.6)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
parallel (1.24.0)
parser (3.3.2.0)
observer (0.1.2)
parallel (1.25.1)
parser (3.3.3.0)
ast (~> 2.4.1)
racc
pg (1.4.6)
Expand All @@ -396,17 +400,19 @@ GEM
postgres-copy (1.7.1)
activerecord (>= 5.1)
pg (>= 0.17)
protocol (2.0.0)
ruby_parser (~> 3.0)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
pry-byebug (3.10.1)
byebug (~> 11.0)
pry (>= 0.13, < 0.15)
pry-rails (0.3.9)
pry (>= 0.10.4)
pry-rails (0.3.11)
pry (>= 0.13.0)
psych (5.1.2)
stringio
public_suffix (5.0.5)
public_suffix (6.0.0)
puma (5.6.8)
nio4r (~> 2.0)
racc (1.8.0)
Expand Down Expand Up @@ -481,7 +487,7 @@ GEM
recaptcha (3.4.0)
json
regexp_parser (2.9.2)
reline (0.5.8)
reline (0.5.9)
io-console (~> 0.5)
request_store (1.7.0)
rack (>= 1.4)
Expand All @@ -495,8 +501,8 @@ GEM
netrc (~> 0.8)
reverse_markdown (2.1.1)
nokogiri
rexml (3.2.8)
strscan (>= 3.0.9)
rexml (3.3.1)
strscan
rqrcode (1.2.0)
chunky_png (~> 1.0)
rqrcode_core (~> 0.2)
Expand All @@ -509,15 +515,15 @@ GEM
rspec-expectations (>= 2.99.0.beta1)
rspec-core (3.13.0)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.0)
rspec-expectations (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-github (2.4.0)
rspec-core (~> 3.0)
rspec-mocks (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-rails (6.1.2)
rspec-rails (6.1.3)
actionpack (>= 6.1)
activesupport (>= 6.1)
railties (>= 6.1)
Expand Down Expand Up @@ -581,10 +587,10 @@ GEM
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
semantic_range (3.0.0)
sentry-rails (5.17.3)
sentry-rails (5.18.1)
railties (>= 5.0)
sentry-ruby (~> 5.17.3)
sentry-ruby (5.17.3)
sentry-ruby (~> 5.18.1)
sentry-ruby (5.18.1)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
sexp_processor (4.17.1)
Expand All @@ -597,21 +603,22 @@ GEM
base64
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets-rails (3.5.1)
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
stringio (3.0.1.1)
stringio (3.1.1)
strscan (3.1.0)
sync (0.5.0)
sys-filesystem (1.4.5)
sys-filesystem (1.5.0)
ffi (~> 1.1)
term-ansicolor (1.8.0)
term-ansicolor (1.10.2)
mize
tins (~> 1.0)
terrapin (0.6.0)
climate_control (>= 0.0.3, < 1.0)
thor (1.3.1)
tilt (2.3.0)
tilt (2.4.0)
timecop (0.9.6)
timeout (0.4.1)
tins (1.33.0)
Expand Down Expand Up @@ -662,7 +669,7 @@ GEM
xpath (3.2.0)
nokogiri (~> 1.8)
yard (0.9.36)
zeitwerk (2.6.15)
zeitwerk (2.6.16)

PLATFORMS
ruby
Expand All @@ -680,7 +687,6 @@ DEPENDENCIES
awesome_print (~> 1.6)
aws-sdk-s3 (~> 1.86)
azure-storage-blob (~> 2.0)
base64 (= 0.1.1)
binding_of_caller (~> 1.0.0)
bluecloth (~> 2.2)
blueprinter (~> 0.25.1)
Expand All @@ -692,6 +698,7 @@ DEPENDENCIES
capybara-screenshot (~> 1.0)
clipboard-rails (~> 1.7)
closure_tree!
csv
daemons (~> 1.2)
dalli (~> 3.2)
database_cleaner (~> 2.0)
Expand Down Expand Up @@ -722,6 +729,7 @@ DEPENDENCIES
letter_opener (~> 1.4)
listen (~> 3.0)
mocha (~> 1.1)
observer
odata_server!
parallel (~> 1.19)
pg (~> 1.4.6)
Expand Down Expand Up @@ -765,7 +773,6 @@ DEPENDENCIES
spinjs-rails (~> 1.3.0)
spreadsheet
sprockets (~> 3)
stringio (= 3.0.1.1)
sys-filesystem (~> 1.4)
term-ansicolor (~> 1.3)
terrapin (~> 0.6.0)
Expand Down
Loading