Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

THREESCALE-11448: Upgrade to Rails 7.0 #3945

Merged
merged 21 commits into from
Jan 15, 2025
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 .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ commands: # reusable commands with parameters
taskname=$(echo $CIRCLE_JOB | sed -e 's/-\(postgres\|oracle\|[0-9]\).*//')
bundle exec rake "test:files:${taskname}" | circleci tests run --command="cat > $list" --verbose --split-by=timings
if [ -s $list ]; then
bundle exec rake test:run TEST="$(cat $list)" TESTOPTS=--verbose --verbose --trace
bundle exec rails test $(awk 'ORS=" "' < $list) --verbose --backtrace
fi
environment: *malloc_preload
- upload-artifacts
Expand Down
16 changes: 8 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ gem 'aws-sdk-rails', '~> 3'
gem 'aws-sdk-s3', '~> 1'

gem 'dotenv-rails', '~> 2.7'
gem 'rails', '~> 6.1'
gem 'rails', '~> 7.0.0'

gem 'mail', '~> 2.8.1'

Expand All @@ -24,7 +24,7 @@ gem 'protected_attributes_continued', '~> 1.8.2'

gem 'rails-observers'

gem 'strong_migrations', '~> 0.6.8'
gem 'strong_migrations', '~> 2.1.0'

group :assets do
gem 'coffee-rails', '~> 5.0'
Expand Down Expand Up @@ -71,7 +71,7 @@ gem 'cancancan', '~> 3.6.0'
gem 'formtastic', '~> 4.0'
gem 'htmlentities', '~>4.3', '>= 4.3.4'
# TODO: Not actively maintained https://github.com/activeadmin/inherited_resources#notice replace with respond_with and fix things the rails way
gem 'inherited_resources', '~> 1.12.0'
gem 'inherited_resources', '~> 1.14.0'
gem 'json', '~> 2.7', '>= 2.7.1'

gem 'mysql2', '~> 0.5.3'
Expand All @@ -86,7 +86,7 @@ gem 'nokogiri', '~> 1.15.5'
gem 'secure_headers', '~> 6.3.0'
gem 'redlock'

gem 'acts-as-taggable-on', '~> 8.0'
gem 'acts-as-taggable-on', '~> 11.0'
gem 'baby_squeel', '~> 2.0'
gem 'browser'
gem 'diff-lcs', '~> 1.2'
Expand Down Expand Up @@ -149,7 +149,7 @@ gem 'state_machines-activerecord', '~> 0.8'
# for liquid docs on-fly generation
gem 'commonmarker', '~> 0.23.10'
gem 'escape_utils'
gem 'html-pipeline'
gem 'html-pipeline', '~> 2.14.3'

# templating
gem 'ruby-openid'
Expand Down Expand Up @@ -201,7 +201,7 @@ group :test do

gem 'equivalent-xml', require: false

gem 'rspec-rails', '~> 6.1', require: false # version 6.x is needed for for Rails 6.1 or 7.x
gem 'rspec-rails', '~> 7.1', require: false

# Reason to use the fork: https://github.com/kucaahbe/rspec-html-matchers/pull/21
gem 'rspec_api_documentation'
Expand Down Expand Up @@ -235,7 +235,7 @@ group :development, :test do
gem 'active_record_query_trace'

gem 'bootsnap', '~> 1.16'
gem 'bullet', '~> 6.1.5'
gem 'bullet', '~> 7.0.7'
gem 'colorize'
gem 'factory_bot_rails', '~> 6.2'

Expand All @@ -259,7 +259,7 @@ gem 'unicorn', require: false, group: %i[production]
# NOTE: Use ENV['DB'] only to install oracle dependencies
group :oracle do
oracle = -> { (ENV['ORACLE'] == '1') || ENV.fetch('DATABASE_URL', ENV['DB'])&.start_with?('oracle') }
gem 'activerecord-oracle_enhanced-adapter', '~> 6.1.6', install_if: oracle
gem 'activerecord-oracle_enhanced-adapter', '~> 7.0.3', install_if: oracle
gem 'ruby-oci8', require: false, install_if: oracle
end

Expand Down
Loading