activeadmin 2.8.1 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5319bddf9e28d0adf5521d932bfb6b1a27bb8a0f0b84116bf5014148fe04ef8
-  data.tar.gz: 4b41ed99a504af4c5c82f84a959c16a6efa703f09970c4e61b0fc9dd48dbccea
+  metadata.gz: 3a79fadc45ea60de060d130d9ce18ca04b0becd14baae2e46b3749b76cb7bd20
+  data.tar.gz: 59ecfb3dba085bd66b2534991dcba8e14dae2f76a07baae37f8b8daaa4063917
 SHA512:
-  metadata.gz: c15f0a18dab4b6dd28c433d4481c18fc00a406dbad22f397035ad1dcd5fdff5a7e11018bc39fd15af3e92644a94d311b39a6268ff625e5b6c1372424807a8ced
-  data.tar.gz: 444c6aac584a1a13131cdf7b2f1f6c4f2d5a6d4a565c1dee172944837960297223e661534f502e2a1f3624606b9b083337625cd2b2db4eaf0dae357b42f466bd
+  metadata.gz: 2d26b7fb0ffbd1da98ca7b4f685a7c386dcab3f25079f5e16e7926cb1c9ce2060db7ecc27d158608091a178590c9604b33850d5f44009401bee467c6f84811a0
+  data.tar.gz: 1273181e98620f7af30434e4fb669d95eddfa7633d3e5fb5b51fbb31bf8d8b7615e07c413590cba13b86b5fc1e087dc589f7f4f227c6ff62c4ea25925faf07f8

data/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 ## Unreleased
 
+## 2.9.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.8.1..v2.9.0)
+
+### Enhancements
+
+* Support for Rails 6.1. [#6548] by [@deivid-rodriguez]
+* Add ability to override "Remove" button text on has_many forms. [#6523] by [@littleforest]
+* Drop git in gemspec. [#6462] by [@utkarsh2102]
+
+### Bug Fixes
+
+* Pick up upstream fixes in devise templates. [#6536] by [@munen]
+
+### Documentation
+
+* Fix `has_many` syntax in forms documentation. [#6583] by [@krzcho]
+* Add example of using `default_main_content` in show pages. [#6487] by [@sjieg]
+
+### Dependency Changes
+
+* Remove sassc and sprockets runtime dependencies. [#6584] by [@deivid-rodriguez]
+
 ## 2.8.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.8.0..v2.8.1)
 
 ### Bug Fixes
@@ -622,6 +643,13 @@ Please check [0-6-stable] for previous changes.
 [#6422]: https://github.com/activeadmin/activeadmin/pull/6422
 [#6451]: https://github.com/activeadmin/activeadmin/pull/6451
 [#6460]: https://github.com/activeadmin/activeadmin/pull/6460
+[#6462]: https://github.com/activeadmin/activeadmin/pull/6462
+[#6487]: https://github.com/activeadmin/activeadmin/pull/6487
+[#6523]: https://github.com/activeadmin/activeadmin/pull/6523
+[#6536]: https://github.com/activeadmin/activeadmin/pull/6536
+[#6548]: https://github.com/activeadmin/activeadmin/pull/6548
+[#6583]: https://github.com/activeadmin/activeadmin/pull/6583
+[#6584]: https://github.com/activeadmin/activeadmin/pull/6584
 
 [@5t111111]: https://github.com/5t111111
 [@aarek]: https://github.com/aarek
@@ -677,8 +705,10 @@ Please check [0-6-stable] for previous changes.
 [@ko-lem]: https://github.com/ko-lem
 [@kobeumut]: https://github.com/kobeumut
 [@Kris-LIBIS]: https://github.com/Kris-LIBIS
+[@krzcho]: https://github.com/krzcho
 [@kwent]: https://github.com/kwent
 [@leio10]: https://github.com/leio10
+[@littleforest]: https://github.com/littleforest
 [@Looooong]: https://github.com/Looooong
 [@markstory]: https://github.com/markstory
 [@mauriciopasquier]: https://github.com/mauriciopasquier
@@ -686,6 +716,7 @@ Please check [0-6-stable] for previous changes.
 [@micred]: https://github.com/micred
 [@mirelon]: https://github.com/mirelon
 [@mshalaby]: https://github.com/mshalaby
+[@munen]: https://github.com/munen
 [@ndbroadbent]: https://github.com/ndbroadbent
 [@Nguyenanh]: https://github.com/Nguyenanh
 [@orkhan]: https://github.com/orkhan
@@ -703,12 +734,14 @@ Please check [0-6-stable] for previous changes.
 [@ShallmentMo]: https://github.com/ShallmentMo
 [@shekibobo]: https://github.com/shekibobo
 [@shouya]: https://github.com/shouya
+[@sjieg]: https://github.com/sjieg
 [@stefsava]: https://github.com/stefsava
 [@stereoscott]: https://github.com/stereoscott
 [@taralbass]: https://github.com/taralbass
 [@tiagotex]: https://github.com/tiagotex
 [@timoschilling]: https://github.com/timoschilling
 [@TimPetricola]: https://github.com/TimPetricola
+[@utkarsh2102]: https://github.com/utkarsh2102
 [@varyonic]: https://github.com/varyonic
 [@vcsjones]: https://github.com/vcsjones
 [@vfonic]: https://github.com/vfonic

data/CONTRIBUTING.md

@@ -136,12 +136,12 @@ git push --set-upstream origin 325-add-japanese-translations
 
 Finally, go to GitHub and [make a Pull Request][] :D
 
-CircleCI will run our test suite against all supported Rails versions. We care
-about quality, so your PR won't be merged until all tests pass. It's unlikely,
-but it's possible that your changes pass tests in one Rails version but fail in
-another. In that case, you'll have to setup your development environment (as
-explained in step 3) to use the problematic Rails version, and investigate
-what's going on!
+Github Actions will run our test suite against all supported Rails versions. We
+care about quality, so your PR won't be merged until all tests pass. It's
+unlikely, but it's possible that your changes pass tests in one Rails version
+but fail in another. In that case, you'll have to setup your development
+environment (as explained in step 3) to use the problematic Rails version, and
+investigate what's going on!
 
 ### Keeping your Pull Request updated
 

data/README.md

@@ -4,7 +4,7 @@
 creating elegant backends for website administration.
 
 [![Version         ][rubygems_badge]][rubygems]
-[![Circle CI       ][circle_badge]][circle]
+[![Github Actions  ][actions_badge]][actions]
 [![Coverage        ][coverage_badge]][coverage]
 [![Tidelift        ][tidelift_badge]][tidelift]
 [![Inch CI         ][inch_badge]][inch]
@@ -93,8 +93,8 @@ Thanks to [Open Collective][opencollective contributors] and all our Open Collec
 
 [rubygems_badge]: http://img.shields.io/gem/v/activeadmin.svg
 [rubygems]: https://rubygems.org/gems/activeadmin
-[circle_badge]: https://circleci.com/gh/activeadmin/activeadmin/tree/master.svg?style=svg
-[circle]: https://circleci.com/gh/activeadmin/activeadmin/tree/master
+[actions_badge]: https://github.com/activeadmin/activeadmin/workflows/ci/badge.svg
+[actions]: https://github.com/activeadmin/activeadmin/actions
 [coverage_badge]: https://api.codeclimate.com/v1/badges/779e407d22bacff19733/test_coverage
 [coverage]: https://codeclimate.com/github/activeadmin/activeadmin/test_coverage
 [inch_badge]: http://inch-ci.org/github/activeadmin/activeadmin.svg?branch=master

data/app/views/active_admin/devise/mailer/reset_password_instructions.html.erb

@@ -2,7 +2,7 @@
 
 <p>Someone has requested a link to change your password, and you can do this through the link below.</p>
 
-<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @resource.reset_password_token) %></p>
+<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
 
 <p>If you didn't request this, please ignore this email.</p>
 <p>Your password won't change until you access the link above and create a new one.</p>

data/app/views/active_admin/devise/mailer/unlock_instructions.html.erb

@@ -1,7 +1,7 @@
 <p>Hello <%= @resource.email %>!</p>
 
-<p>Your account has been locked due to an excessive amount of unsuccessful sign in attempts.</p>
+<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
 
 <p>Click the link below to unlock your account:</p>
 
-<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @resource.unlock_token) %></p>
+<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p>

data/docs/5-forms.md

@@ -110,8 +110,9 @@ ActiveAdmin.register Post do
       end
     end
     f.inputs do
-      f.has_many :comment,
+      f.has_many :comments,
                  new_record: 'Leave Comment',
+                 remove_record: 'Remove Comment',
                  allow_destroy: -> (c) { c.author?(current_admin_user) } do |b|
         b.input :body
       end
@@ -139,6 +140,10 @@ The `:new_record` option controls the visibility of the new record button (shown
 by default).  If you pass a string, it will be used as the text for the new
 record button.
 
+The `:remove_record` option controls the text of the remove button (shown after
+the new record button is pressed). If you pass a string, it will be used as the
+text for the remove button.
+
 The `:sortable` option adds a hidden field and will enable drag & drop sorting
 of the children. It expects the name of the column that will store the index of
 each child.

data/docs/6-show-pages.md

@@ -79,3 +79,15 @@ ActiveAdmin.register Book do
   end
 end
 ```
+
+If you want to keep the default show data, but add something extra to it:
+
+```ruby
+show do
+  div do
+    h3 'Some custom charts about this object'
+    render partial: 'charts'
+  end
+  default_main_content
+end
+```

data/docs/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.2)
+    activesupport (6.0.3.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -16,10 +16,10 @@ GEM
     colorator (1.1.0)
     commonmarker (0.17.13)
       ruby-enum (~> 0.5)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     dnsruby (1.61.4)
       simpleidn (~> 0.1)
-    em-websocket (0.5.1)
+    em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     ethon (0.12.0)
@@ -31,23 +31,23 @@ GEM
     ffi (1.13.1)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
-    github-pages (207)
+    github-pages (209)
       github-pages-health-check (= 1.16.1)
       jekyll (= 3.9.0)
       jekyll-avatar (= 0.7.0)
       jekyll-coffeescript (= 1.1.1)
       jekyll-commonmark-ghpages (= 0.1.6)
       jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.13.0)
+      jekyll-feed (= 0.15.1)
       jekyll-gist (= 1.5.0)
       jekyll-github-metadata (= 2.13.0)
-      jekyll-mentions (= 1.5.1)
+      jekyll-mentions (= 1.6.0)
       jekyll-optional-front-matter (= 0.3.2)
       jekyll-paginate (= 1.1.0)
       jekyll-readme-index (= 0.3.0)
-      jekyll-redirect-from (= 0.15.0)
+      jekyll-redirect-from (= 0.16.0)
       jekyll-relative-links (= 0.6.1)
-      jekyll-remote-theme (= 0.4.1)
+      jekyll-remote-theme (= 0.4.2)
       jekyll-sass-converter (= 1.5.2)
       jekyll-seo-tag (= 2.6.1)
       jekyll-sitemap (= 1.4.0)
@@ -55,7 +55,7 @@ GEM
       jekyll-theme-architect (= 0.1.1)
       jekyll-theme-cayman (= 0.1.1)
       jekyll-theme-dinky (= 0.1.1)
-      jekyll-theme-hacker (= 0.1.1)
+      jekyll-theme-hacker (= 0.1.2)
       jekyll-theme-leap-day (= 0.1.1)
       jekyll-theme-merlot (= 0.1.1)
       jekyll-theme-midnight (= 0.1.1)
@@ -66,14 +66,14 @@ GEM
       jekyll-theme-tactile (= 0.1.1)
       jekyll-theme-time-machine (= 0.1.1)
       jekyll-titles-from-headings (= 0.5.3)
-      jemoji (= 0.11.1)
+      jemoji (= 0.12.0)
       kramdown (= 2.3.0)
       kramdown-parser-gfm (= 1.1.0)
       liquid (= 4.0.3)
       mercenary (~> 0.3)
       minima (= 2.5.1)
       nokogiri (>= 1.10.4, < 2.0)
-      rouge (= 3.19.0)
+      rouge (= 3.23.0)
       terminal-table (~> 1.4)
     github-pages-health-check (1.16.1)
       addressable (~> 2.3)
@@ -81,7 +81,7 @@ GEM
       octokit (~> 4.0)
       public_suffix (~> 3.0)
       typhoeus (~> 1.3)
-    html-pipeline (2.13.0)
+    html-pipeline (2.14.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
@@ -114,14 +114,14 @@ GEM
       rouge (>= 2.0, < 4.0)
     jekyll-default-layout (0.1.4)
       jekyll (~> 3.0)
-    jekyll-feed (0.13.0)
+    jekyll-feed (0.15.1)
       jekyll (>= 3.7, < 5.0)
     jekyll-gist (1.5.0)
       octokit (~> 4.2)
     jekyll-github-metadata (2.13.0)
       jekyll (>= 3.4, < 5.0)
       octokit (~> 4.0, != 4.4.0)
-    jekyll-mentions (1.5.1)
+    jekyll-mentions (1.6.0)
       html-pipeline (~> 2.3)
       jekyll (>= 3.7, < 5.0)
     jekyll-optional-front-matter (0.3.2)
@@ -129,14 +129,15 @@ GEM
     jekyll-paginate (1.1.0)
     jekyll-readme-index (0.3.0)
       jekyll (>= 3.0, < 5.0)
-    jekyll-redirect-from (0.15.0)
+    jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
     jekyll-relative-links (0.6.1)
       jekyll (>= 3.3, < 5.0)
-    jekyll-remote-theme (0.4.1)
+    jekyll-remote-theme (0.4.2)
       addressable (~> 2.0)
       jekyll (>= 3.5, < 5.0)
-      rubyzip (>= 1.3.0)
+      jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
+      rubyzip (>= 1.3.0, < 3.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
     jekyll-seo-tag (2.6.1)
@@ -153,8 +154,8 @@ GEM
     jekyll-theme-dinky (0.1.1)
       jekyll (~> 3.5)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-hacker (0.1.1)
-      jekyll (~> 3.5)
+    jekyll-theme-hacker (0.1.2)
+      jekyll (> 3.5, < 5.0)
       jekyll-seo-tag (~> 2.0)
     jekyll-theme-leap-day (0.1.1)
       jekyll (~> 3.5)
@@ -188,7 +189,7 @@ GEM
       jekyll (>= 3.3, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jemoji (0.11.1)
+    jemoji (0.12.0)
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
@@ -206,7 +207,7 @@ GEM
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.14.1)
+    minitest (5.14.2)
     multipart-post (2.1.1)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
@@ -220,7 +221,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.4)
-    rouge (3.19.0)
+    rouge (3.23.0)
     ruby-enum (0.8.0)
       i18n
     rubyzip (2.3.0)

data/lib/active_admin.rb

@@ -8,7 +8,6 @@ require "formtastic"
 require "formtastic_i18n"
 require "inherited_resources"
 require "jquery-rails"
-require "sassc-rails"
 require "arbre"
 
 require "active_admin/helpers/i18n"

data/lib/active_admin/engine.rb

@@ -6,11 +6,13 @@ module ActiveAdmin
     end
 
     initializer "active_admin.precompile", group: :all do |app|
-      ActiveAdmin.application.stylesheets.each do |path, _|
-        app.config.assets.precompile << path
-      end
-      ActiveAdmin.application.javascripts.each do |path|
-        app.config.assets.precompile << path
+      unless ActiveAdmin.application.use_webpacker
+        ActiveAdmin.application.stylesheets.each do |path, _|
+          app.config.assets.precompile << path
+        end
+        ActiveAdmin.application.javascripts.each do |path|
+          app.config.assets.precompile << path
+        end
       end
     end
 

data/lib/active_admin/error.rb

@@ -45,8 +45,6 @@ module ActiveAdmin
       raise new exception
     end
 
-    private
-
     def self.database_error_classes
       @classes ||= []
     end

data/lib/active_admin/filters/active_filter.rb

@@ -113,8 +113,6 @@ module ActiveAdmin
         @predicate_association
       end
 
-      private
-
       def find_predicate_association
         condition_attribute.klass.reflect_on_all_associations.
           reject { |r| r.options[:polymorphic] }. #skip polymorphic

data/lib/active_admin/form_builder.rb

@@ -40,7 +40,7 @@ module ActiveAdmin
     attr_reader :assoc
     attr_reader :options
     attr_reader :heading, :sortable_column, :sortable_start
-    attr_reader :new_record, :destroy_option
+    attr_reader :new_record, :destroy_option, :remove_record
 
     def initialize(has_many_form, assoc, options)
       super has_many_form
@@ -72,6 +72,7 @@ module ActiveAdmin
       @sortable_start = options.delete(:sortable_start) || 0
       @new_record = options.key?(:new_record) ? options.delete(:new_record) : true
       @destroy_option = options.delete(:allow_destroy)
+      @remove_record = options.delete(:remove_record)
       options
     end
 
@@ -107,7 +108,8 @@ module ActiveAdmin
     def has_many_actions(form_builder, contents)
       if form_builder.object.new_record?
         contents << template.content_tag(:li) do
-          template.link_to I18n.t("active_admin.has_many_remove"), "#", class: "button has_many_remove"
+          remove_text = remove_record.is_a?(String) ? remove_record : I18n.t("active_admin.has_many_remove")
+          template.link_to remove_text, "#", class: "button has_many_remove"
         end
       elsif allow_destroy?(form_builder.object)
         form_builder.input(

data/lib/active_admin/resource/routes.rb

@@ -42,8 +42,6 @@ module ActiveAdmin
         config[:route_collection_name] == config[:route_instance_name]
       end
 
-      private
-
       class RouteBuilder
         def initialize(resource)
           @resource = resource

data/lib/active_admin/resource_controller/decorators.rb

@@ -57,8 +57,6 @@ module ActiveAdmin
           @cache[name] ||= wrap! collection_decorator, name
         end
 
-        private
-
         def self.wrap!(parent, name)
           ::Class.new parent do
             delegate :reorder, :page, :current_page, :total_pages, :limit_value,

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = "2.8.1"
+  VERSION = "2.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.9.0
 platform: ruby
 authors:
 - Charles Maresh
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -128,7 +128,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -159,40 +159,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.1
-- !ruby/object:Gem::Dependency
-  name: sassc-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.1'
 description: The administration framework for Ruby on Rails.
 email:
 - deivid.rodriguez@riseup.net
@@ -611,7 +577,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.1
+rubygems_version: 3.2.0
 signing_key: 
 specification_version: 4
 summary: Active Admin is a Ruby on Rails plugin for generating administration style