Skip to content

Commit

Permalink
Merge pull request #181 from datacite/rails-to-7.1
Browse files Browse the repository at this point in the history
rails 7.1 upgrade
  • Loading branch information
wendelfabianchinsamy authored Apr 15, 2024
2 parents b3f8533 + 91e2d0e commit 3b6a43d
Show file tree
Hide file tree
Showing 9 changed files with 201 additions and 143 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Install
run: |
cp .env.build .env
gem install bundler -v 2.4.20
gem install bundler -v 2.5.6
bundle config path vendor/bundle
bundle install --jobs 4 --retry 3
- name: Lint and Test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Install
run: |
cp .env.build .env
gem install bundler -v 2.4.20
gem install bundler -v 2.5.6
bundle config path vendor/bundle
bundle install --jobs 4 --retry 3
- name: Lint and Test
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ RUN mkdir -p vendor/bundle && \
chown -R app:app . && \
chmod -R 755 . && \
gem update --system 3.4.22 && \
gem install bundler -v 2.4.20 && \
gem install bundler -v 2.5.6 && \
/sbin/setuser app bundle install --path vendor/bundle

# enable SSH
Expand Down
12 changes: 6 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gem "active_model_serializers", "~> 0.10.0"
gem "api-pagination"
gem "aws-sdk-sqs", "~> 1.3"
gem "bcrypt", "~> 3.1.7"
gem "bolognese", "~> 2.1.0"
gem "bolognese", "~> 2.2"
gem "bootsnap", "~> 1.2", ">= 1.2.1"
gem "cancancan", "~> 2.0"
gem "countries", "~> 2.1", ">= 2.1.2"
Expand All @@ -23,14 +23,14 @@ gem "kaminari", "~> 1.0", ">= 1.0.1"
gem "lograge", "~> 0.11.2"
gem "logstash-event", "~> 1.2", ">= 1.2.02"
gem "logstash-logger", "~> 0.26.1"
gem "maremma", "~> 4.9.6"
gem "nokogiri", "~> 1.13.2"
gem "maremma", "~> 5.0"
gem "nokogiri", "~> 1.16", ">= 1.16.3"
gem "oj", ">= 2.8.3"
gem "oj_mimic_json", "~> 1.0", ">= 1.0.1"
gem "rack-cors", "~> 1.0", require: "rack/cors"
gem "rack-utf8_sanitizer", "~> 1.6"
gem "rails", "6.1.7.3"
gem "sentry-raven", "~> 2.9"
gem "rails", "~> 7.1", ">= 7.1.3.2"
gem "sentry-raven", "~> 3.1", ">= 3.1.2"
gem "shoryuken", "~> 4.0"
gem "simple_command"
gem "slack-notifier", "~> 2.3", ">= 2.3.2"
Expand All @@ -48,7 +48,7 @@ group :development, :test do
end

group :development do
gem "listen", ">= 3.0.5", "< 3.2"
gem "listen", "~> 3.9"
gem "spring"
gem "spring-watcher-listen", "~> 2.0.0"
end
Expand Down
Loading

0 comments on commit 3b6a43d

Please sign in to comment.