Skip to content

Commit ed84bc7

Browse files
Use arbre 1.3.0 in CI (activeadmin#6432)
1 parent 6444af0 commit ed84bc7

File tree

8 files changed

+20
-56
lines changed

8 files changed

+20
-56
lines changed

Gemfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ group :development, :test do
55
gem 'pry' # Easily debug from your console with `binding.pry`
66
gem 'pry-byebug', platform: :mri # Step-by-step debugging
77

8-
gem 'arbre', github: 'activeadmin/arbre', ref: 'b546d7a10b95001cb7bd1273bbaa55172de77e98'
9-
108
gem 'cancancan'
119
gem 'pundit'
1210
gem 'jruby-openssl', '~> 0.10.1', platform: :jruby

Gemfile.lock

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
GIT
2-
remote: https://github.com/activeadmin/arbre.git
3-
revision: b546d7a10b95001cb7bd1273bbaa55172de77e98
4-
ref: b546d7a10b95001cb7bd1273bbaa55172de77e98
5-
specs:
6-
arbre (1.2.1)
7-
activesupport (>= 3.0.0, < 6.1)
8-
ruby2_keywords (>= 0.0.2)
9-
101
GIT
112
remote: https://github.com/rails/sprockets-rails.git
123
revision: c269f5e01fdffa5c41350e855183d94ff33d318a
@@ -156,6 +147,9 @@ GEM
156147
apparition (0.6.0)
157148
capybara (~> 3.13, < 4)
158149
websocket-driver (>= 0.6.5)
150+
arbre (1.3.0)
151+
activesupport (>= 3.0.0, < 6.1)
152+
ruby2_keywords (>= 0.0.2, < 1.0)
159153
ast (2.4.1)
160154
bcrypt (3.1.13)
161155
bcrypt (3.1.13-java)
@@ -485,7 +479,6 @@ DEPENDENCIES
485479
activeadmin!
486480
activerecord-jdbcsqlite3-adapter (~> 60.0)
487481
apparition
488-
arbre!
489482
cancancan
490483
capybara (~> 3.14)
491484
chandler (= 0.9.0)

gemfiles/rails_52/Gemfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ group :development, :test do
55
gem 'pry' # Easily debug from your console with `binding.pry`
66
gem 'pry-byebug', platform: :mri # Step-by-step debugging
77

8-
gem 'arbre', github: 'activeadmin/arbre', ref: 'b546d7a10b95001cb7bd1273bbaa55172de77e98'
9-
108
gem 'cancancan'
119
gem 'pundit'
1210
gem 'jruby-openssl', '~> 0.10.1', platform: :jruby

gemfiles/rails_52/Gemfile.lock

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
GIT
2-
remote: https://github.com/activeadmin/arbre.git
3-
revision: b546d7a10b95001cb7bd1273bbaa55172de77e98
4-
ref: b546d7a10b95001cb7bd1273bbaa55172de77e98
5-
specs:
6-
arbre (1.2.1)
7-
activesupport (>= 3.0.0, < 6.1)
8-
ruby2_keywords (>= 0.0.2)
9-
101
GIT
112
remote: https://github.com/rails/sprockets-rails.git
123
revision: c269f5e01fdffa5c41350e855183d94ff33d318a
@@ -142,6 +133,9 @@ GEM
142133
apparition (0.6.0)
143134
capybara (~> 3.13, < 4)
144135
websocket-driver (>= 0.6.5)
136+
arbre (1.3.0)
137+
activesupport (>= 3.0.0, < 6.1)
138+
ruby2_keywords (>= 0.0.2, < 1.0)
145139
arel (9.0.0)
146140
bcrypt (3.1.13)
147141
bcrypt (3.1.13-java)
@@ -157,7 +151,7 @@ GEM
157151
regexp_parser (~> 1.5)
158152
xpath (~> 3.2)
159153
coderay (1.1.2)
160-
concurrent-ruby (1.1.6)
154+
concurrent-ruby (1.1.7)
161155
crass (1.0.6)
162156
cucumber (4.1.0)
163157
builder (~> 3.2, >= 3.2.3)
@@ -225,7 +219,7 @@ GEM
225219
has_scope (0.7.2)
226220
actionpack (>= 4.1)
227221
activesupport (>= 4.1)
228-
i18n (1.8.3)
222+
i18n (1.8.5)
229223
concurrent-ruby (~> 1.0)
230224
inherited_resources (1.11.0)
231225
actionpack (>= 5.0, < 6.1)
@@ -273,7 +267,7 @@ GEM
273267
mimemagic (0.3.5)
274268
mini_mime (1.0.2)
275269
mini_portile2 (2.4.0)
276-
minitest (5.14.1)
270+
minitest (5.14.2)
277271
multi_test (0.1.2)
278272
nio4r (2.5.2)
279273
nio4r (2.5.2-java)
@@ -397,7 +391,6 @@ DEPENDENCIES
397391
activeadmin!
398392
activerecord-jdbcsqlite3-adapter (~> 52.0)
399393
apparition
400-
arbre!
401394
cancancan
402395
capybara (~> 3.14)
403396
cucumber

gemfiles/rails_60_turbolinks/Gemfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ group :development, :test do
55
gem 'pry' # Easily debug from your console with `binding.pry`
66
gem 'pry-byebug', platform: :mri # Step-by-step debugging
77

8-
gem 'arbre', github: 'activeadmin/arbre', ref: 'b546d7a10b95001cb7bd1273bbaa55172de77e98'
9-
108
gem 'cancancan'
119
gem 'pundit'
1210
gem 'jruby-openssl', '~> 0.10.1', platform: :jruby

gemfiles/rails_60_turbolinks/Gemfile.lock

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
GIT
2-
remote: https://github.com/activeadmin/arbre.git
3-
revision: b546d7a10b95001cb7bd1273bbaa55172de77e98
4-
ref: b546d7a10b95001cb7bd1273bbaa55172de77e98
5-
specs:
6-
arbre (1.2.1)
7-
activesupport (>= 3.0.0, < 6.1)
8-
ruby2_keywords (>= 0.0.2)
9-
101
GIT
112
remote: https://github.com/rails/sprockets-rails.git
123
revision: c269f5e01fdffa5c41350e855183d94ff33d318a
@@ -156,6 +147,9 @@ GEM
156147
apparition (0.6.0)
157148
capybara (~> 3.13, < 4)
158149
websocket-driver (>= 0.6.5)
150+
arbre (1.3.0)
151+
activesupport (>= 3.0.0, < 6.1)
152+
ruby2_keywords (>= 0.0.2, < 1.0)
159153
bcrypt (3.1.13)
160154
bcrypt (3.1.13-java)
161155
builder (3.2.4)
@@ -170,7 +164,7 @@ GEM
170164
regexp_parser (~> 1.5)
171165
xpath (~> 3.2)
172166
coderay (1.1.2)
173-
concurrent-ruby (1.1.6)
167+
concurrent-ruby (1.1.7)
174168
crass (1.0.6)
175169
cucumber (4.1.0)
176170
builder (~> 3.2, >= 3.2.3)
@@ -238,7 +232,7 @@ GEM
238232
has_scope (0.7.2)
239233
actionpack (>= 4.1)
240234
activesupport (>= 4.1)
241-
i18n (1.8.3)
235+
i18n (1.8.5)
242236
concurrent-ruby (~> 1.0)
243237
inherited_resources (1.11.0)
244238
actionpack (>= 5.0, < 6.1)
@@ -286,7 +280,7 @@ GEM
286280
mimemagic (0.3.5)
287281
mini_mime (1.0.2)
288282
mini_portile2 (2.4.0)
289-
minitest (5.14.1)
283+
minitest (5.14.2)
290284
multi_test (0.1.2)
291285
nio4r (2.5.2)
292286
nio4r (2.5.2-java)
@@ -406,7 +400,7 @@ GEM
406400
websocket-extensions (0.1.5)
407401
xpath (3.2.0)
408402
nokogiri (~> 1.8)
409-
zeitwerk (2.3.1)
403+
zeitwerk (2.4.0)
410404

411405
PLATFORMS
412406
java
@@ -416,7 +410,6 @@ DEPENDENCIES
416410
activeadmin!
417411
activerecord-jdbcsqlite3-adapter (~> 60.0)
418412
apparition
419-
arbre!
420413
cancancan
421414
capybara (~> 3.14)
422415
cucumber

gemfiles/rails_60_webpacker/Gemfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ group :development, :test do
55
gem 'pry' # Easily debug from your console with `binding.pry`
66
gem 'pry-byebug', platform: :mri # Step-by-step debugging
77

8-
gem 'arbre', github: 'activeadmin/arbre', ref: 'b546d7a10b95001cb7bd1273bbaa55172de77e98'
9-
108
gem 'cancancan'
119
gem 'pundit'
1210
gem 'jruby-openssl', '~> 0.10.1', platform: :jruby

gemfiles/rails_60_webpacker/Gemfile.lock

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
GIT
2-
remote: https://github.com/activeadmin/arbre.git
3-
revision: b546d7a10b95001cb7bd1273bbaa55172de77e98
4-
ref: b546d7a10b95001cb7bd1273bbaa55172de77e98
5-
specs:
6-
arbre (1.2.1)
7-
activesupport (>= 3.0.0, < 6.1)
8-
ruby2_keywords (>= 0.0.2)
9-
101
GIT
112
remote: https://github.com/rails/sprockets-rails.git
123
revision: c269f5e01fdffa5c41350e855183d94ff33d318a
@@ -156,6 +147,9 @@ GEM
156147
apparition (0.6.0)
157148
capybara (~> 3.13, < 4)
158149
websocket-driver (>= 0.6.5)
150+
arbre (1.3.0)
151+
activesupport (>= 3.0.0, < 6.1)
152+
ruby2_keywords (>= 0.0.2, < 1.0)
159153
bcrypt (3.1.13)
160154
bcrypt (3.1.13-java)
161155
builder (3.2.4)
@@ -286,7 +280,7 @@ GEM
286280
mimemagic (0.3.5)
287281
mini_mime (1.0.2)
288282
mini_portile2 (2.4.0)
289-
minitest (5.14.1)
283+
minitest (5.14.2)
290284
multi_test (0.1.2)
291285
nio4r (2.5.2)
292286
nio4r (2.5.2-java)
@@ -421,7 +415,6 @@ DEPENDENCIES
421415
activeadmin!
422416
activerecord-jdbcsqlite3-adapter (~> 60.0)
423417
apparition
424-
arbre!
425418
cancancan
426419
capybara (~> 3.14)
427420
cucumber

0 commit comments

Comments
 (0)