8000 Add Rails 7 Support by tagliala · Pull Request #7235 · activeadmin/activeadmin · GitHub
[go: up one dir, main page]
Skip to content

Add Rails 7 Support #7235

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Mar 7, 2022
Merged

Add Rails 7 Support #7235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ea37380
Allow Rails 7.0
mgrunberg Jan 24, 2022
21b98b8
Fix ActiveSupport::Dependencies.costantize
tagliala Dec 20, 2021
f19f1ac
Replace to_s with to_formatted_s
tagliala Dec 20, 2021
626172c
Support specs running with config.eager_load=true
mgrunberg Feb 25, 2022
73ce06e
Remove JRuby platform from Rails 7.0 Gemfile
tagliala Mar 5, 2022
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
6 changes: 6 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ updates:
interval: daily
versioning-strategy: lockfile-only

- package-ecosystem: bundler
directory: /gemfiles/rails_61
schedule:
interval: daily
versioning-strategy: lockfile-only

- package-ecosystem: bundler
directory: /gemfiles/rails_61_turbolinks
schedule:
Expand Down
19 changes: 16 additions & 3 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,12 @@ jobs:

os: [ubuntu-20.04]

deps: [rails_60, rails_61]
deps: [rails_60, rails_61, rails_70]

exclude:
- ruby: { name: '2.6', value: 2.6.9 }
os: ubuntu-20.04
deps: rails_70

include:
- ruby: { name: '3.0', value: 3.0.3 }
Expand All @@ -106,10 +111,18 @@ jobs:
os: ubuntu-20.04
deps: rails_61

- ruby: { name: '3.0', value: 3.0.3 }
os: ubuntu-20.04
deps: rails_70

- ruby: { name: 3.1, value: 3.1.0 }
os: ubuntu-20.04
deps: rails_61

- ruby: { name: 3.1, value: 3.1.0 }
os: ubuntu-20.04
deps: rails_70

- ruby: { name: 3.1, value: 3.1.0 }
os: ubuntu-20.04
deps: rails_61_turbolinks
Expand All @@ -128,13 +141,13 @@ jobs:
run: |
echo "BUNDLE_GEMFILE=Gemfile" >> $GITHUB_ENV
echo "BUNDLE_PATH=$(pwd)/vendor/bundle" >> $GITHUB_ENV
if: matrix.deps == 'rails_61'
if: matrix.deps == 'rails_70'

- name: Configure bundler (alternative)
run: |
echo "BUNDLE_GEMFILE=gemfiles/${{ matrix.deps }}/Gemfile" >> $GITHUB_ENV
echo "BUNDLE_PATH=$(pwd)/gemfiles/${{ matrix.deps }}/vendor/bundle" >> $GITHUB_ENV
if: matrix.deps != 'rails_61'
if: matrix.deps != 'rails_70'

- uses: ruby/setup-ruby@v1
with:
Expand Down
1 change: 1 addition & 0 deletions .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ AllCops:
- tmp/development_apps/**/*
- tmp/test_apps/**/*
- gemfiles/rails_60/vendor/bundle/**/*
- gemfiles/rails_61/vendor/bundle/**/*
- gemfiles/rails_61_turbolinks/vendor/bundle/**/*
- gemfiles/rails_61_webpacker/vendor/bundle/**/*
- vendor/bundle/**/*
Expand Down
A79D
4 changes: 1 addition & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@ group :development, :test do

gem "cancancan"
gem "pundit"
gem "jruby-openssl", platform: :jruby

gem "draper"
gem "devise"

gem "rails", "~> 6.1.0"
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
gem "rails", "~> 7.0.0"

gem "net-smtp" # The mail gem, depended on transitively, does not specify this dependency

Expand Down
Loading
0