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.

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

Update Ruby from 3.1.1 to 3.3.0 #1006

Merged
merged 4 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.1
3.3.0
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ azure-cli 2.37.0
nodejs 18.1.0
postgres 13.5
redis 6.2.6
ruby 3.1.1
ruby 3.3.0
yarn 1.22.19
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.1.1-alpine
FROM ruby:3.3.0-alpine

RUN apk -U upgrade && \
apk add --update --no-cache gcc git libc6-compat libc-dev make nodejs \
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby "3.1.1"
ruby "3.3.0"

gem "audits1984", "~> 0.1.4"
gem "bootsnap", require: false
Expand Down Expand Up @@ -57,6 +57,7 @@ group :development, :test do
gem "debug", platforms: %i[mri mingw x64_mingw]
gem "dotenv-rails"
gem "factory_bot_rails"
gem "pry-byebug"
end

group :development do
Expand Down
27 changes: 21 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ GEM
bootsnap (1.16.0)
msgpack (~> 1.2)
builder (3.2.4)
byebug (11.1.3)
capybara (3.39.2)
addressable
matrix
Expand All @@ -108,6 +109,7 @@ GEM
capybara (>= 2.4, < 4.0)
mail
choice (0.2.0)
coderay (1.1.3)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
console1984 (0.1.29)
Expand Down Expand Up @@ -196,9 +198,10 @@ GEM
i18n (1.14.1)
concurrent-ruby (~> 1.0)
inflection (1.0.0)
io-console (0.6.0)
irb (1.6.4)
reline (>= 0.3.0)
io-console (0.7.2)
irb (1.11.1)
rdoc
reline (>= 0.4.2)
jaro_winkler (1.5.4)
jsbundling-rails (1.1.2)
railties (>= 6.0.0)
Expand Down Expand Up @@ -281,6 +284,14 @@ GEM
racc
pg (1.5.3)
prettier_print (1.2.1)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
pry-byebug (3.10.1)
byebug (~> 11.0)
pry (>= 0.13, < 0.15)
psych (5.1.2)
stringio
public_suffix (5.0.1)
puma (6.4.2)
nio4r (~> 2.0)
Expand Down Expand Up @@ -329,10 +340,12 @@ GEM
rainbow (3.1.1)
rake (13.1.0)
rbs (2.8.4)
rdoc (6.6.2)
psych (>= 4.0.0)
redcarpet (3.6.0)
redis (4.8.1)
regexp_parser (2.8.1)
reline (0.3.3)
reline (0.4.2)
io-console (~> 0.5)
responders (3.1.0)
actionpack (>= 5.2)
Expand Down Expand Up @@ -447,6 +460,7 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
stringio (3.1.0)
syntax_tree (6.1.1)
prettier_print (>= 1.2.0)
syntax_tree-haml (4.0.3)
Expand Down Expand Up @@ -539,6 +553,7 @@ DEPENDENCIES
pagy
pg (~> 1.5)
prettier_print (~> 1.2.1)
pry-byebug
puma (~> 6.4)
rack-attack
rails (~> 7.0.6)
Expand Down Expand Up @@ -566,7 +581,7 @@ DEPENDENCIES
webmock (~> 3.18)

RUBY VERSION
ruby 3.1.1p18
ruby 3.3.0p0

BUNDLED WITH
2.3.8
2.5.5
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ def save
return false unless valid?

ZendeskDeleteRequest.from_csv(file)
true
end
end
end
2 changes: 1 addition & 1 deletion app/models/zendesk_delete_request.rb
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def self.to_csv(scope = no_duplicates.since_launch)

def self.from_csv(csv)
CSV.foreach(csv.path, headers: true) do |row|
find_or_create_by(
find_or_create_by!(
closed_at: row["Closed At"],
enquiry_type: row["Enquiry Type"],
group_name: row["Group Name"],
Expand Down
Loading