Skip to content

Commit

Permalink
Merge staging into master
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Nov 22, 2024
2 parents 2241c40 + cfd197a commit 1033459
Show file tree
Hide file tree
Showing 48 changed files with 446 additions and 284 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/continuous-delivery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ jobs:
env: ${{ needs.metadata.outputs.stage }}

- name: Deploy
uses: appleboy/ssh-action@25ce8cbbcb08177468c7ff7ec5cbfa236f9341e1 # v1.1.0
uses: appleboy/ssh-action@7eaf76671a0d7eec5d98ee897acda4f968735a17 # v1.2.0
env:
STAGE: ${{ needs.metadata.outputs.stage }}
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push image
uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5.4.0
uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
with:
push: true
context: .
Expand Down
64 changes: 32 additions & 32 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,48 +3,48 @@ source 'https://rubygems.org'
gem 'active_model_otp', git: 'https://github.com/heapsource/active_model_otp.git', ref: '6ed9927'
gem 'dav4rack', git: 'https://github.com/csvalpha/dav4rack.git', ref: '8541e53'

gem 'bcrypt', '~> 3.1'
gem 'bootsnap', '~> 1.4'
gem 'bcrypt', '~> 3.1', '>= 3.1.20'
gem 'bootsnap', '~> 1.18', '>= 1.18.4'
gem 'carrierwave', '~> 2.1'
gem 'carrierwave-base64', '~> 2.5'
gem 'carrierwave-bombshelter', '~> 0.2'
gem 'carrierwave-base64', '~> 2.11'
gem 'carrierwave-bombshelter', '~> 0.2', '>= 0.2.2'
gem 'case_transform', '~> 0.2'
gem 'counter_culture', '~> 3.0'
gem 'counter_culture', '~> 3.8', '>= 3.8.2'
gem 'dav4rack_ext', '~> 1.0'
gem 'doorkeeper', '~> 5.2'
gem 'doorkeeper-i18n', '~> 5.2'
gem 'exifr', '~> 1.3'
gem 'friendly_id', '~> 5.2'
gem 'http', '~> 5.0'
gem 'iban-tools', '~> 1.1.0'
gem 'icalendar', '~> 2.4'
gem 'doorkeeper-i18n', '~> 5.2', '>= 5.2.7'
gem 'exifr', '~> 1.4'
gem 'friendly_id', '~> 5.5', '>= 5.5.1'
gem 'http', '~> 5.2'
gem 'iban-tools', '~> 1.2.1'
gem 'icalendar', '~> 2.10', '>= 2.10.3'
gem 'improvmx', '~> 0.2.1'
gem 'isbn_validation', '~> 1.2'
gem 'jsonapi-authorization', '~> 3.0'
gem 'jsonapi-resources', '~> 0.9.1.beta2'
gem 'message_bus', '~> 4.0'
gem 'mini_magick', '~> 4.6'
gem 'isbn_validation', '~> 1.2', '>= 1.2.2'
gem 'jsonapi-authorization', '~> 3.0', '>= 3.0.2'
gem 'jsonapi-resources', '~> 0.9.1'
gem 'message_bus', '~> 4.3', '>= 4.3.8'
gem 'mini_magick', '~> 4.13', '>= 4.13.2'
gem 'paper_trail', '~> 14.0'
gem 'paranoia', '~> 3.0'
gem 'pg', '~> 1.0'
gem 'pg', '~> 1.5', '>= 1.5.9'
gem 'phonelib'
gem 'puma', '~> 6.0'
gem 'pundit', '~> 2.0'
gem 'rack-attack', '~> 6.0'
gem 'rack-cors', '~> 2.0', '>= 2.0.1', require: 'rack/cors'
gem 'pundit', '~> 2.4'
gem 'rack-attack', '~> 6.7'
gem 'rack-cors', '~> 2.0', '>= 2.0.2', require: 'rack/cors'
gem 'rails', '~> 7.0', '>= 7.0.4.3'
gem 'rails-i18n', '~> 7.0'
gem 'redis', '~> 4.0'
gem 'roo', '~> 2.9'
gem 'ruby-filemagic', '~> 0.7'
gem 'rubyzip', '~> 2.0'
gem 'sentry-raven', '~> 3.0'
gem 'sepa_king', '~> 0.11'
gem 'sidekiq', '~> 6.0'
gem 'sidekiq-scheduler', '~> 5.0', '>= 5.0.2'
gem 'slack-notifier', '~> 2.0'
gem 'rails-i18n', '~> 7.0', '>= 7.0.10'
gem 'redis', '~> 4.8', '>= 4.8.1'
gem 'roo', '~> 2.10', '>= 2.10.1'
gem 'ruby-filemagic', '~> 0.7', '>= 0.7.3'
gem 'rubyzip', '~> 2.3', '>= 2.3.2'
gem 'sentry-raven', '~> 3.1', '>= 3.1.2'
gem 'sepa_king', '~> 0.14'
gem 'sidekiq', '~> 6.5', '>= 6.5.12'
gem 'sidekiq-scheduler', '~> 5.0', '>= 5.0.6'
gem 'slack-notifier', '~> 2.4'
gem 'validates_timeliness', '~> 7.0.0.beta2'
gem 'vpim', '~> 13.11'
gem 'vpim', '~> 24.2', '>= 24.2.20'

group :development, :test do
gem 'awesome_print'
Expand All @@ -54,7 +54,7 @@ group :development, :test do
gem 'consistency_fail'
gem 'dotenv-rails'
gem 'factory_bot_rails'
gem 'faker', '~> 3.0'
gem 'faker', '~> 3.5', '>= 3.5.1'
gem 'fuubar'
gem 'pry-byebug', require: false
gem 'pry-rails'
Expand Down
Loading

0 comments on commit 1033459

Please sign in to comment.