Skip to content

Commit b637843

Browse files
authored
Merge pull request #661 from activeadmin/dependabot/add-v2-config-file
Upgrade to GitHub-native Dependabot
2 parents 93a16a6 + 3dcabcc commit b637843

File tree

9 files changed

+116
-106
lines changed

9 files changed

+116
-106
lines changed

.dependabot/config.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

.github/dependabot.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
3+
version: 2
4+
5+
updates:
6+
- package-ecosystem: bundler
7+
directory: /
8+
schedule:
9+
interval: daily
10+
versioning-strategy: lockfile-only
11+
12+
- package-ecosystem: bundler
13+
directory: /test/rails_60
14+
schedule:
15+
interval: daily
16+
versioning-strategy: lockfile-only
17+
18+
- package-ecosystem: bundler
19+
directory: /test/rails_52
20+
schedule:
21+
interval: daily
22+
versioning-strategy: lockfile-only

.github/mergify.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
3+
pull_request_rules:
4+
- name: Automatic merge for dependabot pull requests
5+
6+
conditions:
7+
- author~=^dependabot(|-preview)\[bot\]$
8+
- check-success=lint
9+
- check-success=test(ruby-2.5, rails_52)
10+
- check-success=test(ruby-2.5, rails_60)
11+
- check-success=test(ruby-2.5, rails_61)
12+
- check-success=test(ruby-2.6, rails_52)
13+
- check-success=test(ruby-2.6, rails_60)
14+
- check-success=test(ruby-2.6, rails_61)
15+
- check-success=test(ruby-2.7, rails_52)
16+
- check-success=test(ruby-2.7, rails_60)
17+
- check-success=test(ruby-2.7, rails_61)
18+
- check-success=test(jruby-9.2, rails_52)
19+
- check-success=test(jruby-9.2, rails_60)
20+
- check-success=test(jruby-9.2, rails_61)
21+
22+
actions:
23+
merge:
24+
method: merge

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ group :development do
99
gem 'minitest-rg'
1010
gem 'rails-controller-testing'
1111
gem 'rubocop'
12-
gem 'chandler', '0.9.0'
12+
gem 'chandler'
1313
end

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ PLATFORMS
197197
ruby
198198

199199
DEPENDENCIES
200-
chandler (= 0.9.0)
200+
chandler
201201
inherited_resources!
202202
minitest-rg
203203
mocha

test/rails_52/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ group :development do
88
gem 'mocha'
99
gem 'minitest-rg'
1010
gem 'rails-controller-testing'
11-
gem 'chandler', '0.9.0'
11+
gem 'chandler'
1212
end

test/rails_52/Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ PLATFORMS
159159
ruby
160160

161161
DEPENDENCIES
162-
chandler (= 0.9.0)
162+
chandler
163163
inherited_resources!
164164
minitest-rg
165165
mocha

test/rails_60/Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ source 'https://rubygems.org'
33
gemspec path: '../..'
44

55
group :development do
6-
gem 'rails', '~> 6.1.3'
6+
gem 'rails', '~> 6.0.3.a'
77

88
gem 'mocha'
99
gem 'minitest-rg'
1010
gem 'rails-controller-testing'
11-
gem 'chandler', '0.9.0'
11+
gem 'chandler'
1212
end

test/rails_60/Gemfile.lock

Lines changed: 64 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -10,65 +10,61 @@ PATH
1010
GEM
1111
remote: https://rubygems.org/
1212
specs:
13-
actioncable (6.1.3.2)
14-
actionpack (= 6.1.3.2)
15-
activesupport (= 6.1.3.2)
13+
actioncable (6.0.3.7)
14+
actionpack (= 6.0.3.7)
1615
nio4r (~> 2.0)
1716
websocket-driver (>= 0.6.1)
18-
actionmailbox (6.1.3.2)
19-
actionpack (= 6.1.3.2)
20-
activejob (= 6.1.3.2)
21-
activerecord (= 6.1.3.2)
22-
activestorage (= 6.1.3.2)
23-
activesupport (= 6.1.3.2)
17+
actionmailbox (6.0.3.7)
18+
actionpack (= 6.0.3.7)
19+
activejob (= 6.0.3.7)
20+
activerecord (= 6.0.3.7)
21+
activestorage (= 6.0.3.7)
22+
activesupport (= 6.0.3.7)
2423
mail (>= 2.7.1)
25-
actionmailer (6.1.3.2)
26-
actionpack (= 6.1.3.2)
27-
actionview (= 6.1.3.2)
28-
activejob (= 6.1.3.2)
29-
activesupport (= 6.1.3.2)
24+
actionmailer (6.0.3.7)
25+
actionpack (= 6.0.3.7)
26+
actionview (= 6.0.3.7)
27+
activejob (= 6.0.3.7)
3028
mail (~> 2.5, >= 2.5.4)
3129
rails-dom-testing (~> 2.0)
32-
actionpack (6.1.3.2)
33-
actionview (= 6.1.3.2)
34-
activesupport (= 6.1.3.2)
35-
rack (~> 2.0, >= 2.0.9)
30+
actionpack (6.0.3.7)
31+
actionview (= 6.0.3.7)
32+
activesupport (= 6.0.3.7)
33+
rack (~> 2.0, >= 2.0.8)
3634
rack-test (>= 0.6.3)
3735
rails-dom-testing (~> 2.0)
3836
rails-html-sanitizer (~> 1.0, >= 1.2.0)
39-
actiontext (6.1.3.2)
40-
actionpack (= 6.1.3.2)
41-
activerecord (= 6.1.3.2)
42-
activestorage (= 6.1.3.2)
43-
activesupport (= 6.1.3.2)
37+
actiontext (6.0.3.7)
38+
actionpack (= 6.0.3.7)
39+
activerecord (= 6.0.3.7)
40+
activestorage (= 6.0.3.7)
41+
activesupport (= 6.0.3.7)
4442
nokogiri (>= 1.8.5)
45-
actionview (6.1.3.2)
46-
activesupport (= 6.1.3.2)
43+
actionview (6.0.3.7)
44+
activesupport (= 6.0.3.7)
4745
builder (~> 3.1)
4846
erubi (~> 1.4)
4947
rails-dom-testing (~> 2.0)
5048
rails-html-sanitizer (~> 1.1, >= 1.2.0)
51-
activejob (6.1.3.2)
52-
activesupport (= 6.1.3.2)
49+
activejob (6.0.3.7)
50+
activesupport (= 6.0.3.7)
5351
globalid (>= 0.3.6)
54-
activemodel (6.1.3.2)
55-
activesupport (= 6.1.3.2)
56-
activerecord (6.1.3.2)
57-
activemodel (= 6.1.3.2)
58-
activesupport (= 6.1.3.2)
59-
activestorage (6.1.3.2)
60-
actionpack (= 6.1.3.2)
61-
activejob (= 6.1.3.2)
62-
activerecord (= 6.1.3.2)
63-
activesupport (= 6.1.3.2)
52+
activemodel (6.0.3.7)
53+
activesupport (= 6.0.3.7)
54+
activerecord (6.0.3.7)
55+
activemodel (= 6.0.3.7)
56+
activesupport (= 6.0.3.7)
57+
activestorage (6.0.3.7)
58+
actionpack (= 6.0.3.7)
59+
activejob (= 6.0.3.7)
60+
activerecord (= 6.0.3.7)
6461
marcel (~> 1.0.0)
65-
mini_mime (~> 1.0.2)
66-
activesupport (6.1.3.2)
62+
activesupport (6.0.3.7)
6763
concurrent-ruby (~> 1.0, >= 1.0.2)
68-
i18n (>= 1.6, < 2)
69-
minitest (>= 5.1)
70-
tzinfo (~> 2.0)
71-
zeitwerk (~> 2.3)
64+
i18n (>= 0.7, < 2)
65+
minitest (~> 5.1)
66+
tzinfo (~> 1.1)
67+
zeitwerk (~> 2.2, >= 2.2.2)
7268
addressable (2.7.0)
7369
public_suffix (>= 2.0.2, < 5.0)
7470
builder (3.2.4)
@@ -101,7 +97,7 @@ GEM
10197
mini_mime (>= 0.1.1)
10298
marcel (1.0.1)
10399
method_source (1.0.0)
104-
mini_mime (1.0.3)
100+
mini_mime (1.1.0)
105101
mini_portile2 (2.5.1)
106102
minitest (5.14.4)
107103
minitest-rg (5.2.0)
@@ -125,20 +121,20 @@ GEM
125121
rack (2.2.3)
126122
rack-test (1.1.0)
127123
rack (>= 1.0, < 3)
128-
rails (6.1.3.2)
129-
actioncable (= 6.1.3.2)
130-
actionmailbox (= 6.1.3.2)
131-
actionmailer (= 6.1.3.2)
132-
actionpack (= 6.1.3.2)
133-
actiontext (= 6.1.3.2)
134-
actionview (= 6.1.3.2)
135-
activejob (= 6.1.3.2)
136-
activemodel (= 6.1.3.2)
137-
activerecord (= 6.1.3.2)
138-
activestorage (= 6.1.3.2)
139-
activesupport (= 6.1.3.2)
140-
bundler (>= 1.15.0)
141-
railties (= 6.1.3.2)
124+
rails (6.0.3.7)
125+
actioncable (= 6.0.3.7)
126+
actionmailbox (= 6.0.3.7)
127+
actionmailer (= 6.0.3.7)
128+
actionpack (= 6.0.3.7)
129+
actiontext (= 6.0.3.7)
130+
actionview (= 6.0.3.7)
131+
activejob (= 6.0.3.7)
132+
activemodel (= 6.0.3.7)
133+
activerecord (= 6.0.3.7)
134+
activestorage (= 6.0.3.7)
135+
activesupport (= 6.0.3.7)
136+
bundler (>= 1.3.0)
137+
railties (= 6.0.3.7)
142138
sprockets-rails (>= 2.0.0)
143139
rails-controller-testing (1.0.5)
144140
actionpack (>= 5.0.1.rc1)
@@ -149,12 +145,12 @@ GEM
149145
nokogiri (>= 1.6)
150146
rails-html-sanitizer (1.3.0)
151147
loofah (~> 2.3)
152-
railties (6.1.3.2)
153-
actionpack (= 6.1.3.2)
154-
activesupport (= 6.1.3.2)
148+
railties (6.0.3.7)
149+
actionpack (= 6.0.3.7)
150+
activesupport (= 6.0.3.7)
155151
method_source
156152
rake (>= 0.8.7)
157-
thor (~> 1.0)
153+
thor (>= 0.20.3, < 2.0)
158154
rake (13.0.3)
159155
responders (3.0.1)
160156
actionpack (>= 5.0)
@@ -171,8 +167,10 @@ GEM
171167
activesupport (>= 4.0)
172168
sprockets (>= 3.0.0)
173169
thor (1.1.0)
174-
tzinfo (2.0.4)
175-
concurrent-ruby (~> 1.0)
170+
thread_safe (0.3.6)
171+
thread_safe (0.3.6-java)
172+
tzinfo (1.2.9)
173+
thread_safe (~> 0.1)
176174
websocket-driver (0.7.3)
177175
websocket-extensions (>= 0.1.0)
178176
websocket-driver (0.7.3-java)
@@ -185,11 +183,11 @@ PLATFORMS
185183
ruby
186184

187185
DEPENDENCIES
188-
chandler (= 0.9.0)
186+
chandler
189187
inherited_resources!
190188
minitest-rg
191189
mocha
192-
rails (~> 6.1.3)
190+
rails (~> 6.0.3.a)
193191
rails-controller-testing
194192

195193
BUNDLED WITH

0 commit comments

Comments
 (0)