Skip to content

Commit 9e6434c

Browse files
committed
Install ActiveAdmin branch to test fix on Windows
This is only temporary for testing and will be reset once test is completed.
1 parent 2ed0565 commit 9e6434c

2 files changed

Lines changed: 17 additions & 11 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", "4.0.0.beta20" # github: "activeadmin/activeadmin", branch: "master"
15+
gem "activeadmin", github: "activeadmin/activeadmin", branch: "select-children-bg-color-fix"
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: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
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+
116
GEM
217
remote: https://rubygems.org/
318
specs:
@@ -47,15 +62,6 @@ GEM
4762
erubi (~> 1.11)
4863
rails-dom-testing (~> 2.2)
4964
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)
5965
activejob (8.1.2)
6066
activesupport (= 8.1.2)
6167
globalid (>= 0.3.6)
@@ -319,7 +325,7 @@ PLATFORMS
319325
x86_64-linux
320326

321327
DEPENDENCIES
322-
activeadmin (= 4.0.0.beta20)
328+
activeadmin!
323329
capybara
324330
cssbundling-rails (= 1.4.2)
325331
debug

0 commit comments

Comments
 (0)