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
309 changes: 158 additions & 151 deletions .idea/galc-api.iml

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins:
- rubocop-rails

AllCops:
TargetRailsVersion: 8.0
TargetRailsVersion: 8.1
UseCache: false
Exclude:
# Exclude generated files
Expand All @@ -12,6 +12,12 @@ AllCops:
# Exclude vendor files in GitHub build
- 'vendor/**/*'

# Disable block length check in spec files.
Layout/BlockLength:
Exclude:
- 'config/environments/*'
- 'spec/**/*'

# Allow one line around block body (Layout/EmptyLines will still disallow two or more)
Layout/EmptyLinesAroundBlockBody:
Enabled: false
Expand Down
11 changes: 5 additions & 6 deletions .simplecov
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
require 'simplecov-rcov'

SimpleCov.start 'rails' do
add_filter %w[/bin/ /db/]
coverage_dir 'artifacts'
formatter SimpleCov::Formatter::RcovFormatter
minimum_coverage 100
end
SimpleCov.load_profile 'rails'
SimpleCov.skip %w[/bin/ /db/]
SimpleCov.coverage_dir 'artifacts'
SimpleCov.formatter SimpleCov::Formatter::RcovFormatter
SimpleCov.minimum_coverage 100
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# The base stage scaffolds elements which are common to building and running
# the application, such as installing ca-certificates, creating the app user,
# and installing runtime system dependencies.
FROM ruby:3.3-slim AS base
FROM ruby:3.4-slim AS base

# ------------------------------------------------------------
# Declarative metadata
Expand Down Expand Up @@ -88,7 +88,7 @@ RUN apt-get update -qq && apt-get install -y --no-install-recommends \
USER $APP_USER

# Base image ships with an older version of bundler
RUN gem install bundler --version 2.7.2
RUN gem install bundler --version 4.0.8

# Install gems. We don't enforce the validity of the Gemfile.lock until the
# final (production) stage.
Expand Down
10 changes: 5 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '~> 3.3'
ruby '~> 3.4'

gem 'berkeley_library-alma', '~> 0.1.1'
gem 'berkeley_library-logging', '~> 0.3'
Expand All @@ -10,16 +10,16 @@ gem 'drb'
gem 'image_processing', '~> 1.12'
gem 'jsonapi.rb', '~> 2.0'
gem 'jsonapi-serializer', '~> 2.2'
gem 'jwt', '~> 2.4'
gem 'jwt', '~> 2.10', '>= 2.10.3'
gem 'mutex_m'
gem 'omniauth', '~> 2.1'
gem 'omniauth-cas', '~> 3.0'
gem 'pg', '~> 1.4'
gem 'pg_search', '~> 2.3'
gem 'puma', '~> 7.2'
gem 'puma', '~> 7.2', '>= 7.2.1'
gem 'puma-plugin-delayed_stop', '~> 0.1.2'
gem 'rack-cors'
gem 'rails', '~> 8.0.5'
gem 'rails', '~> 8.1.3'
gem 'ransack', '~> 4.2'
gem 'zaru', '~> 0.3.0'

Expand All @@ -44,7 +44,7 @@ group :test do
gem 'rspec', '~> 3.13'
gem 'rspec_junit_formatter', '~> 0.6'
gem 'rspec-rails', '~> 8.0'
gem 'simplecov', '~> 0.22', require: false
gem 'simplecov', '~> 1.0.0.rc4', require: false
gem 'simplecov-rcov', '~> 0.3', require: false
gem 'webmock', require: false
end
Loading
Loading