Browse Source

Inherited resources release is rails 7 compatible now (#232)

pull/233/head
baarkerlounger 3 years ago committed by GitHub
parent
commit
143ecf1cc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      Gemfile
  2. 20
      Gemfile.lock

1
Gemfile

@ -26,7 +26,6 @@ gem "discard"
# Administration framework # Administration framework
gem "activeadmin", git: "https://github.com/tagliala/activeadmin.git", branch: "feature/railties-7" gem "activeadmin", git: "https://github.com/tagliala/activeadmin.git", branch: "feature/railties-7"
gem "arbre", github: "activeadmin/arbre" gem "arbre", github: "activeadmin/arbre"
gem "inherited_resources", git: "https://github.com/activeadmin/inherited_resources.git"
# Admin charts # Admin charts
gem "chartkick" gem "chartkick"
# Spreadsheet parsing # Spreadsheet parsing

20
Gemfile.lock

@ -6,16 +6,6 @@ GIT
activesupport (>= 3.0.0, < 7.1) activesupport (>= 3.0.0, < 7.1)
ruby2_keywords (>= 0.0.2, < 1.0) ruby2_keywords (>= 0.0.2, < 1.0)
GIT
remote: https://github.com/activeadmin/inherited_resources.git
revision: a0a350245a2ec76c040f8751707c1d98792534dd
specs:
inherited_resources (1.13.0)
actionpack (>= 5.2, < 7.1)
has_scope (~> 0.6)
railties (>= 5.2, < 7.1)
responders (>= 2, < 4)
GIT GIT
remote: https://github.com/baarkerlounger/devise.git remote: https://github.com/baarkerlounger/devise.git
revision: 0f585ea6683a06858863597628b48610731c2613 revision: 0f585ea6683a06858863597628b48610731c2613
@ -30,7 +20,7 @@ GIT
GIT GIT
remote: https://github.com/tagliala/activeadmin.git remote: https://github.com/tagliala/activeadmin.git
revision: 12ef798e1a02084565fa2ea698e26334dbc56e42 revision: 8ccc35b8144482284c90b0af74a01e940765f7a6
branch: feature/railties-7 branch: feature/railties-7
specs: specs:
activeadmin (2.9.0) activeadmin (2.9.0)
@ -183,6 +173,11 @@ GEM
turbo-rails turbo-rails
i18n (1.8.11) i18n (1.8.11)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
inherited_resources (1.13.1)
actionpack (>= 5.2, < 7.1)
has_scope (~> 0.6)
railties (>= 5.2, < 7.1)
responders (>= 2, < 4)
iniparse (1.5.0) iniparse (1.5.0)
io-wait (0.2.1) io-wait (0.2.1)
jquery-rails (4.4.0) jquery-rails (4.4.0)
@ -216,7 +211,7 @@ GEM
method_source (1.0.0) method_source (1.0.0)
mini_mime (1.1.2) mini_mime (1.1.2)
minitest (5.15.0) minitest (5.15.0)
msgpack (1.4.2) msgpack (1.4.3)
net-imap (0.2.3) net-imap (0.2.3)
digest digest
net-protocol net-protocol
@ -438,7 +433,6 @@ DEPENDENCIES
govuk-components govuk-components
govuk_design_system_formbuilder govuk_design_system_formbuilder
hotwire-rails hotwire-rails
inherited_resources!
json-schema json-schema
listen (~> 3.3) listen (~> 3.3)
overcommit (>= 0.37.0) overcommit (>= 0.37.0)

Loading…
Cancel
Save