Skip to content
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.3.8
3.4.5
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.3.8-alpine3.21 AS base
FROM ruby:3.4.5-alpine3.21 AS base

RUN apk add git --no-cache

Expand Down
4 changes: 2 additions & 2 deletions 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.3.8"
ruby "3.4.5"

# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem "rails", "~> 7.2.2.1"
Expand Down Expand Up @@ -45,7 +45,7 @@ gem "citizens_advice_form_builder",

gem "view_component", "~> 3.23"

gem "ddtrace"
gem "datadog"
gem "factory_bot_rails"
gem "faraday"
gem "faraday-net_http_persistent"
Expand Down
32 changes: 15 additions & 17 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -181,16 +181,14 @@ GEM
cucumber (>= 5, < 10)
railties (>= 5.2, < 9)
cucumber-tag-expressions (6.1.2)
datadog-ci (0.8.3)
datadog (2.19.0)
datadog-ruby_core_source (~> 3.4, >= 3.4.1)
libdatadog (~> 18.1.0.1.0)
libddwaf (~> 1.24.1.0.3)
logger
msgpack
datadog-ruby_core_source (3.4.1)
date (3.4.1)
ddtrace (1.23.3)
datadog-ci (~> 0.8.1)
debase-ruby_core_source (= 3.3.1)
libdatadog (~> 7.0.0.1.0)
libddwaf (~> 1.14.0.0.0)
msgpack
debase-ruby_core_source (3.3.1)
debug (1.11.0)
irb (~> 1.10)
reline (>= 0.3.8)
Expand Down Expand Up @@ -261,16 +259,16 @@ GEM
railties (>= 6.0.0)
json (2.12.2)
language_server-protocol (3.17.0.5)
libdatadog (7.0.0.1.0)
libdatadog (7.0.0.1.0-aarch64-linux)
libdatadog (7.0.0.1.0-x86_64-linux)
libddwaf (1.14.0.0.0-aarch64-linux)
libdatadog (18.1.0.1.0)
libdatadog (18.1.0.1.0-aarch64-linux)
libdatadog (18.1.0.1.0-x86_64-linux)
libddwaf (1.24.1.0.3-aarch64-linux)
ffi (~> 1.0)
libddwaf (1.14.0.0.0-arm64-darwin)
libddwaf (1.24.1.0.3-arm64-darwin)
ffi (~> 1.0)
libddwaf (1.14.0.0.0-x86_64-darwin)
libddwaf (1.24.1.0.3-x86_64-darwin)
ffi (~> 1.0)
libddwaf (1.14.0.0.0-x86_64-linux)
libddwaf (1.24.1.0.3-x86_64-linux)
ffi (~> 1.0)
license_finder (7.2.1)
bundler
Expand Down Expand Up @@ -546,7 +544,7 @@ DEPENDENCIES
climate_control
cssbundling-rails
cucumber-rails
ddtrace
datadog
debug
dotenv-rails
factory_bot_rails
Expand Down Expand Up @@ -580,7 +578,7 @@ DEPENDENCIES
wizard_steps (~> 0.1.4)

RUBY VERSION
ruby 3.3.8p144
ruby 3.4.5p51

BUNDLED WITH
2.4.20
1 change: 1 addition & 0 deletions app/controllers/suppliers_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class SuppliersController < ApplicationController
class SupplierNotFoundError < StandardError; end

include SwiftypeMeta

rescue_from SupplierNotFoundError, with: :not_found
rescue_from Contentful::GraphqlAdapter::QueryError, with: :internal_server_error

Expand Down