Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
cf6b8bc
Initial commit - Rails upgrade to 7.2.3
kaysiz Nov 10, 2025
0d9cfcf
Rails >= 7.2 nolonger requires frozen string literal comment
kaysiz Nov 11, 2025
e35c8ca
Add migration update schema
kaysiz Nov 11, 2025
be6b002
Upgrade ruby to 3.2.9
kaysiz Nov 11, 2025
f02abca
fix graphql issues with the upgrade
kaysiz Nov 11, 2025
121e30b
fix rubocop issue on lupo schema
kaysiz Nov 11, 2025
85ae248
fix failing graphql tests
kaysiz Nov 11, 2025
ff0109d
Adjust models for rails 7.2
kaysiz Nov 11, 2025
51fa552
fix reversed name
kaysiz Nov 11, 2025
86622b9
:Merge branch 'master' of github.com:datacite/lupo into ks-rails-upgr…
kaysiz Nov 11, 2025
7b028ba
trigger ci build
kaysiz Nov 11, 2025
6a0bcfd
remove graphql cache
kaysiz Nov 17, 2025
99a061c
fix serializer for activity change
kaysiz Nov 17, 2025
a127d29
fix alias methods for metadata and meta models
kaysiz Nov 17, 2025
8a1235c
update activities count spec
kaysiz Nov 24, 2025
d59fc3f
pass correct type to elastic search for dates and fix repository argu…
kaysiz Nov 25, 2025
32e8cf9
revert the change
kaysiz Nov 25, 2025
625faba
fix activity specs to use audited_chnages instead of changes
kaysiz Nov 25, 2025
27b382c
use audited changes instead of changes in spec
kaysiz Dec 1, 2025
0887cb5
Fix failing activities spec and load7.2 defaults
kaysiz Dec 9, 2025
2034cd2
Merge branch 'master' into ks-rails-upgrade/7.2
kaysiz Dec 16, 2025
c5c3c61
change the JWT declaration in tests
kaysiz Dec 16, 2025
4fa4381
mock user creation
kaysiz Dec 16, 2025
b701af2
Merge branch 'ks-rails-upgrade/7.2' of github.com:datacite/lupo into …
kaysiz Dec 16, 2025
3b31cf8
fix rubocop
kaysiz Dec 16, 2025
4234d08
Update timestamps to be iso8601
kaysiz Dec 21, 2025
49e5049
fix indentation
kaysiz Dec 21, 2025
fc573d1
spec the old events correctly
kaysiz Dec 21, 2025
fbd2c16
fix indentation
kaysiz Dec 21, 2025
51fd728
Update ruby version in github workflows
kaysiz Jan 5, 2026
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
4 changes: 2 additions & 2 deletions .github/workflows/parallel_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ jobs:
sudo apt-get install -y ntpdate
sudo ntpdate pool.ntp.org

- name: Set up Ruby 3.1.6
- name: Set up Ruby 3.2.9
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.1.6
ruby-version: 3.2.9
- uses: actions/cache@v4
with:
path: vendor/bundle
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
BUNDLE_PATH: "vendor/bundle"
steps:
- uses: actions/checkout@v4
- name: Set up Ruby 3.1.6
- name: Set up Ruby 3.2.9
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.1.6
ruby-version: 3.2.9
bundler-cache: true
- name: Run RuboCop
run: bundle exec rubocop --parallel
14 changes: 0 additions & 14 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,20 +143,6 @@ Style/DefWithParentheses:
Style/MethodDefParentheses:
Enabled: true

Style/FrozenStringLiteralComment:
Enabled: true
EnforcedStyle: always
Exclude:
- 'actionview/test/**/*.builder'
- 'actionview/test/**/*.ruby'
- 'actionpack/test/**/*.builder'
- 'actionpack/test/**/*.ruby'
- 'activestorage/db/migrate/**/*.rb'
- 'activestorage/db/update_migrate/**/*.rb'
- 'actionmailbox/db/migrate/**/*.rb'
- 'actiontext/db/migrate/**/*.rb'
- 'db/schema.rb'

Style/RedundantFreeze:
Enabled: true

Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.7
3.2.9
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM phusion/passenger-ruby31:3.1.3
FROM phusion/passenger-ruby32:3.1.4

# Set correct environment variables.
ENV HOME /home/app
Expand All @@ -12,8 +12,8 @@ RUN usermod -a -G docker_env app
# Use baseimage-docker's init process.
CMD ["/sbin/my_init"]

# Use Ruby 3.1.6
RUN bash -lc 'rvm --default use ruby-3.1.7'
# Use Ruby 3.2.9
RUN bash -lc 'rvm --default use ruby-3.2.9'

# Update installed APT packages
RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \
Expand Down
17 changes: 7 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gem "aasm", "~> 5.0", ">= 5.0.1"
gem "active_model_serializers", "~> 0.10.0"
gem "activerecord_json_validator", "~> 2.1", ">= 2.1.5"
gem "apollo-federation", "1.1.3"
gem "audited", "~> 5.4", ">= 5.4.3"
gem "audited", "~> 5.8"
gem "aws-sdk-s3"
gem "aws-sdk-sqs", "~> 1.3"
gem "base32-url", "~> 0.3"
Expand Down Expand Up @@ -38,10 +38,8 @@ gem "flipper-active_support_cache_store"
gem "gender_detector", "~> 0.1.2"
gem "git", "~> 1.11"
gem "google-protobuf", ">= 3.25.5"
gem "graphql", "1.11.4"
gem "graphql-batch", "~> 0.4.1"
gem "graphql-cache", "~> 0.6.0"
gem "graphql-errors", "~> 0.4.0"
gem "graphql", "2.0.0"
gem "graphql-batch", "~> 0.5.1"
gem "hashid-rails", "~> 1.4"
gem "iso-639", "~> 0.3.5"
gem "iso8601", "~> 0.9.0"
Expand All @@ -63,7 +61,7 @@ gem "premailer", "~> 1.11", ">= 1.11.1"
gem "pwqgen.rb", "~> 0.1.0"
gem "rack-cors", "~> 1.0", require: "rack/cors"
gem "rack-utf8_sanitizer", "~> 1.6"
gem "rails", "~> 7.1", ">= 7.1.3"
gem "rails", "~> 7.2"
gem "rake", "~> 12.0"
gem "sentry-ruby", "~> 5.20"
gem "sentry-rails", "~> 5.20"
Expand All @@ -85,10 +83,10 @@ end
group :development, :test do
gem "better_errors"
gem "binding_of_caller"
gem "bullet", "~> 7.1", ">= 7.1.6"
gem "bullet", "~> 8.1"
gem "byebug", platforms: %i[mri mingw x64_mingw]
gem "rspec-benchmark", "~> 0.4.0"
gem "rspec-graphql_matchers", "~> 1.4"
gem "rspec-graphql_matchers", "2.0.0.pre.rc.0"
gem "rspec-rails", "~> 6.1", ">= 6.1.1"
end

Expand All @@ -111,8 +109,7 @@ end

group :test do
gem "capybara"
gem "database_cleaner"
gem "database_cleaner-active_record", "~> 2.1"
gem "database_cleaner-active_record", "~> 2.2", ">= 2.2.2"
gem "elasticsearch-extensions", "~> 0.0.29"
gem "factory_bot_rails", "~> 6.4", ">= 6.4.3"
gem "faker", "~> 3.2", ">= 3.2.3"
Expand Down
Loading