10000 Merge pull request #7235 from tagliala/feature/railties-7 · activeadmin/activeadmin@930f0f1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 930f0f1

Browse files
javierjuliojavierjulio
authored
Merge pull request #7235 from tagliala/feature/railties-7
Add Rails 7 Support
2 parents 928ecc9 + 73ce06e commit 930f0f1

File tree

17 files changed

+710
-114
lines changed

17 files changed

+710
-114
lines changed

‎.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ updates:
2727
interval: daily
2828
versioning-strategy: lockfile-only
2929

30+
- package-ecosystem: bundler
31+
directory: /gemfiles/rails_61
32+
schedule:
33+
interval: daily
34+
versioning-strategy: lockfile-only
35+
3036
- package-ecosystem: bundler
3137
directory: /gemfiles/rails_61_turbolinks
3238
schedule:

‎.github/workflows/ci.yaml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,12 @@ jobs:
9595

9696
os: [ubuntu-20.04]
9797

98-
deps: [rails_60, rails_61]
98+
deps: [rails_60, rails_61, rails_70]
99+
100+
exclude:
101+
- ruby: { name: '2.6', value: 2.6.9 }
102+
os: ubuntu-20.04
103+
deps: rails_70
99104

100105
include:
101106
- ruby: { name: '3.0', value: 3.0.3 }
@@ -106,10 +111,18 @@ jobs:
106111
os: ubuntu-20.04
107112
deps: rails_61
108113

114+
- ruby: { name: '3.0', value: 3.0.3 }
115+
os: ubuntu-20.04
116+
deps: rails_70
117+
109118
- ruby: { name: 3.1, value: 3.1.0 }
110119
os: ubuntu-20.04
111120
deps: rails_61
112121

122+
- ruby: { name: 3.1, value: 3.1.0 }
123+
os: ubuntu-20.04
124+
deps: rails_70
125+
113126
- ruby: { name: 3.1, value: 3.1.0 }
114127
os: ubuntu-20.04
115128
deps: rails_61_turbolinks
@@ -128,13 +141,13 @@ jobs:
128141
run: |
129142
echo "BUNDLE_GEMFILE=Gemfile" >> $GITHUB_ENV
130143
echo "BUNDLE_PATH=$(pwd)/vendor/bundle" >> $GITHUB_ENV
131-
if: matrix.deps == 'rails_61'
144+
if: matrix.deps == 'rails_70'
132145

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

139152
- uses: ruby/setup-ruby@v1
140153
with:

‎.rubocop.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ AllCops:
1717
- tmp/development_apps/**/*
1818
- tmp/test_apps/**/*
1919
- gemfiles/rails_60/vendor/bundle/**/*
20+
- gemfiles/rails_61/vendor/bundle/**/*
2021
- gemfiles/rails_61_turbolinks/vendor/bundle/**/*
2122
- gemfiles/rails_61_webpacker/vendor/bundle/**/*
2223
- vendor/bundle/**/*

‎Gemfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@ group :development, :test do
88

99
gem "cancancan"
1010
gem "pundit"
11-
gem "jruby-openssl", platform: :jruby
1211

1312
gem "draper"
1413
gem "devise"
1514

16-
gem "rails", "~> 6.1.0"
17-
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
15+
gem "rails", "~> 7.0.0"
1816

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

0 commit comments

Comments
 (0)
0