Skip to content

Commit f3fd798

Browse files
committed
Reset ActiveAdmin back to beta20 release
1 parent e9e0a18 commit f3fd798

2 files changed

Lines changed: 11 additions & 17 deletions

File tree

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ gem "sprockets-rails"
1212
gem "cssbundling-rails", "1.4.2" # TODO: relax this dependency when rails/cssbundling-rails#169 will be fixed
1313
gem "importmap-rails"
1414

15-
gem "activeadmin", github: "activeadmin/activeadmin", branch: "select-children-bg-color-fix"
15+
gem "activeadmin", "4.0.0.beta20" # github: "activeadmin/activeadmin", branch: "master"
1616
gem "devise", "~> 4.9" # TODO: relax this dependency when formtastic/formtastic#1401 will be fixed
1717

1818
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile.lock

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
GIT
2-
remote: https://github.com/activeadmin/activeadmin.git
3-
revision: 0bf4cdbe61e7a04b5247db3085abb73545984d32
4-
branch: select-children-bg-color-fix
5-
specs:
6-
activeadmin (4.0.0.beta20)
7-
arbre (~> 2.0)
8-
csv
9-
formtastic (>= 5.0)
10-
formtastic_i18n (>= 0.7)
11-
inherited_resources (~> 2.0)
12-
kaminari (>= 1.2.1)
13-
railties (>= 7.2)
14-
ransack (>= 4.0)
15-
161
GEM
172
remote: https://rubygems.org/
183
specs:
@@ -62,6 +47,15 @@ GEM
6247
erubi (~> 1.11)
6348
rails-dom-testing (~> 2.2)
6449
rails-html-sanitizer (~> 1.6)
50+
activeadmin (4.0.0.beta20)
51+
arbre (~> 2.0)
52+
csv
53+
formtastic (>= 5.0)
54+
formtastic_i18n (>= 0.7)
55+
inherited_resources (~> 2.0)
56+
kaminari (>= 1.2.1)
57+
railties (>= 7.2)
58+
ransack (>= 4.0)
6559
activejob (8.1.2)
6660
activesupport (= 8.1.2)
6761
globalid (>= 0.3.6)
@@ -325,7 +319,7 @@ PLATFORMS
325319
x86_64-linux
326320

327321
DEPENDENCIES
328-
activeadmin!
322+
activeadmin (= 4.0.0.beta20)
329323
capybara
330324
cssbundling-rails (= 1.4.2)
331325
debug

0 commit comments

Comments
 (0)