activeadmin 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d4b2286091c361bd4e0e7b408ed7e4f6bf3aa118492ed037cb51b2f6e882cf4
-  data.tar.gz: b9381cb429a6ccfda90d0a51f646c759843c387bda107dcb3d66cffa26cd083f
+  metadata.gz: 31e6adaf39f455cb8188d2982a201d9853a2976e9ae446dcc7958882a6f15422
+  data.tar.gz: 58b45a79713a68cf75a9e0bb13b7cfe90bf5bf1c01e403375de2acdd4ad16881
 SHA512:
-  metadata.gz: 8dba7ffe9ed0516ebfc0f484d548962d677d9d6a36cbf097c0e76e06db7ef87c0469791fdb7917ddd2b831927225958107a16aab3cd096f1ffbf8bc49ebf697d
-  data.tar.gz: d9dd9f7295fe4f0ccc852ab375637578c86621bd30435d62f2c7d7754ccb5693910aa39e0a154fdbd5535613b3f829ef31a8520761162006e12755e85db9dabb
+  metadata.gz: 2c633c0f35fb6a9a90677e8f13d1c7194c8ff3ec3e267ca9249fd0343f09a319ac15148e8067be5b483fb5feab8d6cc9213208ffc24609b233b3b3335d2ba3ca
+  data.tar.gz: 815d48181cbdcc9e36ea268217e320f3542a8791b659b931ca51a7a035d478e3cf00fb84f23e5e7021bc015bafd6c28b04add620a3414953ba32e65d8b7a9da3

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 ## Unreleased
 
+## 2.6.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.5.0..v2.6.0)
+
+### Enhacements
+
+* Display multiple flash messages in separate elements. [#5929] by [@mirelon]
+* Make delete confirmation messages in French & Spanish gender-neutral. [#5946] by [@cprodhomme]
+
+### Bug Fixes
+
+* Export ModalDialog component to re-enable client side usage. [#5956] by [@sgara]
+* Use default ActionView options instead of default Formtastic options for DateRangeInput [#5957] by [@mirelon]
+* Fix i18n key in docs example to translate scopes. [#5943] by [@adler99]
+
 ## 2.5.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.4.0..v2.5.0)
 
 ### Enhancements
@@ -13,7 +26,7 @@
 * Convert namespace to sym to prevent duplicate namespaces such as :foo and 'foo'. [#5931] by [@westonganger]
 * Use filter label when condition has a predicate. [#5886] by [@ko-lem]
 * Fix error when routing with array containing symbol. [#5870] by [@jwesorick]
-* Fix error when there is a model named `Tag` and `meta_tags` have been configured. [#5893] by [@micred], [@FabioRos] and [@deivid-rodriguez]
+* Fix error when there is a model named `Tag` and `meta_tags` have been configured. [#5895] by [@micred], [@FabioRos] and [@deivid-rodriguez]
 * Allow specifying custom `input_html` for `DateRangeInput`. [#5867] by [@mirelon]
 * Adjust `#main_content` right margin to take into account possible custom values of `$sidebar-width` and `$section-padding`. [#5887] by [@guigs]
 * Improved polymorphic routes generation to avoid problems when multiple `belongs_to` are defined. [#5938] by [@leio10]
@@ -518,14 +531,20 @@ Please check [0-6-stable] for previous changes.
 [#5877]: https://github.com/activeadmin/activeadmin/pull/5877
 [#5886]: https://github.com/activeadmin/activeadmin/pull/5886
 [#5870]: https://github.com/activeadmin/activeadmin/pull/5870
-[#5893]: https://github.com/activeadmin/activeadmin/pull/5893
+[#5895]: https://github.com/activeadmin/activeadmin/pull/5895
 [#5867]: https://github.com/activeadmin/activeadmin/pull/5867
 [#5887]: https://github.com/activeadmin/activeadmin/pull/5887
 [#5931]: https://github.com/activeadmin/activeadmin/pull/5931
 [#5938]: https://github.com/activeadmin/activeadmin/pull/5938
+[#5929]: https://github.com/activeadmin/activeadmin/pull/5929
+[#5943]: https://github.com/activeadmin/activeadmin/pull/5943
+[#5946]: https://github.com/activeadmin/activeadmin/pull/5946
+[#5956]: https://github.com/activeadmin/activeadmin/pull/5956
+[#5957]: https://github.com/activeadmin/activeadmin/pull/5957
 
 [@5t111111]: https://github.com/5t111111
 [@aarek]: https://github.com/aarek
+[@adler99]: https://github.com/adler99
 [@ajw725]: https://github.com/ajw725
 [@alex-bogomolov]: https://github.com/alex-bogomolov
 [@amiel]: https://github.com/amiel
@@ -538,6 +557,7 @@ Please check [0-6-stable] for previous changes.
 [@chancancode]: https://github.com/chancancode
 [@chrp]: https://github.com/chrp
 [@chumakoff]: https://github.com/chumakoff
+[@cprodhomme]: https://github.com/cprodhomme
 [@craigmcnamara]: https://github.com/craigmcnamara
 [@DanielHeath]: https://github.com/DanielHeath
 [@deivid-rodriguez]: https://github.com/deivid-rodriguez

data/CONTRIBUTING.md

@@ -5,10 +5,12 @@ like you that make Active Admin such a great tool.
 
 ### Where do I go from here?
 
-If you've noticed a bug or have a question that doesn't belong on the [mailing
-list] or [Stack Overflow], [search the issue tracker] to see if someone else in
-the community has already created a ticket. If not, go ahead and [make one][new
-issue]!
+If you've noticed a bug or have a feature request, [make one][new issue]! It's
+generally best if you get confirmation of your bug or approval for your feature
+request this way before starting to code.
+
+If you have a general question about activeadmin, you can post it on [Stack
+Overflow], the issue tracker is only for bugs and feature requests.
 
 ### Fork & create a branch
 
@@ -67,22 +69,6 @@ export BUNDLE_GEMFILE=gemfiles/rails_60/Gemfile
 **Warning** SCSS assets are aimed to be used indifferently with Sprockets **and** webpacker.
 As such, make sure not to use any sass-rails directives such as `asset-url` or `image-url`.
 
-### Did you find a bug?
-
-* **Ensure the bug was not already reported** by [searching all issues].
-
-* If you're unable to find an open issue addressing the problem,
-  [open a new one][new issue]. Be sure to include a **title and clear
-  description**, as much relevant information as possible, and a **code sample**
-  or an **executable test case** demonstrating the expected behavior that is not
-  occurring.
-
-* If possible, use the relevant bug report templates to create the issue.
-  Simply copy the content of the appropriate template into a .rb file, make the
-  necessary changes to demonstrate the issue, and **paste the content into the
-  issue description**:
-  * [**ActiveAdmin** master issues][master template]
-
 ### Implement your fix or feature
 
 At this point, you're ready to make your changes! Feel free to ask for help;
@@ -225,13 +211,9 @@ Maintainers need to do the following to push out a release:
 * `bin/rake release`
 
 [chandler]: https://github.com/mattbrictson/chandler#2-configure-credentials
-[mailing list]: http://groups.google.com/group/activeadmin
 [Stack Overflow]: http://stackoverflow.com/questions/tagged/activeadmin
-[search the issue tracker]: https://github.com/activeadmin/activeadmin/issues?q=something
 [new issue]: https://github.com/activeadmin/activeadmin/issues/new
 [fork Active Admin]: https://help.github.com/articles/fork-a-repo
-[searching all issues]: https://github.com/activeadmin/activeadmin/issues?q=
-[master template]: https://github.com/activeadmin/activeadmin/blob/master/tasks/bug_report_template.rb
 [make a pull request]: https://help.github.com/articles/creating-a-pull-request
 [git rebasing]: http://git-scm.com/book/en/Git-Branching-Rebasing
 [interactive rebase]: https://help.github.com/articles/interactive-rebase

data/README.md

@@ -93,7 +93,7 @@ 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
+[circle_badge]: https://circleci.com/gh/activeadmin/activeadmin/tree/master.svg?style=svg
 [circle]: https://circleci.com/gh/activeadmin/activeadmin/tree/master
 [coverage_badge]: https://api.codeclimate.com/v1/badges/779e407d22bacff19733/test_coverage
 [coverage]: https://codeclimate.com/github/activeadmin/activeadmin/test_coverage

data/app/assets/javascripts/active_admin/base.js

@@ -10,9 +10,10 @@
 //= require jquery_ujs
 //= require_self
 
-(function(factory) {
-  typeof define === "function" && define.amd ? define([ "jquery", "jquery-ui/ui/widgets/datepicker", "jquery-ui/ui/widgets/dialog", "jquery-ui/ui/widgets/sortable", "jquery-ui/ui/widgets/tabs", "jquery-ui/ui/widget", "jquery-ujs" ], factory) : factory();
-})(function() {
+(function(global, factory) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("jquery"), require("jquery-ui/ui/widgets/datepicker"), require("jquery-ui/ui/widgets/dialog"), require("jquery-ui/ui/widgets/sortable"), require("jquery-ui/ui/widgets/tabs"), require("jquery-ui/ui/widget"), require("jquery-ujs")) : typeof define === "function" && define.amd ? define([ "exports", "jquery", "jquery-ui/ui/widgets/datepicker", "jquery-ui/ui/widgets/dialog", "jquery-ui/ui/widgets/sortable", "jquery-ui/ui/widgets/tabs", "jquery-ui/ui/widget", "jquery-ujs" ], factory) : (global = global || self, 
+  factory(global.ActiveAdmin = {}));
+})(this, function(exports) {
   "use strict";
   $.fn.serializeObject = function() {
     return this.serializeArray().reduce(function(obj, item) {
@@ -506,4 +507,13 @@
     return $("#active_admin_content .tabs").tabs();
   };
   $(document).ready(onDOMReady$2).on("page:load turbolinks:load", onDOMReady$2);
+  function modal_dialog(message, inputs, callback) {
+    console.warn("ActiveAdmin.modal_dialog is deprecated in favor of ActiveAdmin.ModalDialog, please update usage.");
+    return ModalDialog(message, inputs, callback);
+  }
+  exports.ModalDialog = ModalDialog;
+  exports.modal_dialog = modal_dialog;
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
 });

data/app/javascript/active_admin/base.js

@@ -17,3 +17,12 @@ import "./initializers/has-many"
 import "./initializers/per-page"
 import "./initializers/table-checkbox-toggler"
 import "./initializers/tabs"
+
+import ModalDialog from "./lib/modal-dialog";
+
+function modal_dialog(message, inputs, callback) {
+  console.warn("ActiveAdmin.modal_dialog is deprecated in favor of ActiveAdmin.ModalDialog, please update usage.");
+  return ModalDialog(message, inputs, callback);
+}
+
+export { ModalDialog, modal_dialog };

data/config/locales/es.yml

@@ -23,7 +23,7 @@ es:
     view: "Ver"
     edit: "Editar"
     delete: "Eliminar"
-    delete_confirmation: "¿Está seguro de que quiere eliminar esto?"
+    delete_confirmation: "¿Confirma que desea borrar este elemento?"
     create_another: "Crear otro %{model}"
     new_model: "Añadir %{model}"
     edit_model: "Editar %{model}"
@@ -89,7 +89,7 @@ es:
     batch_actions:
       button_label: "Acciones en masa"
       default_confirmation: "¿Seguro que quieres hacer esto?"
-      delete_confirmation: "Eliminar %{plural_model}: ¿Está seguro?"
+      delete_confirmation: "Se eliminarán %{plural_model}. ¿Desea continuar?"
       succesfully_destroyed:
         one: "Se ha destruido 1 %{model} con éxito"
         other: "Se han destruido %{count} %{plural_model} con éxito"
@@ -105,7 +105,7 @@ es:
       author: "Autor"
       add: "Comentar"
       delete: "Borrar Comentario"
-      delete_confirmation: "¿Está seguro que desea borrar este comentario?"
+      delete_confirmation: "¿Confirma que desea borrar este comentario?"
       resource: "Recurso"
       no_comments_yet: "No hay comentarios aún."
       author_missing: "Anónimo"

data/config/locales/fr.yml

@@ -7,7 +7,7 @@ fr:
     view: "Voir"
     edit: "Modifier"
     delete: "Supprimer"
-    delete_confirmation: "Êtes-vous certain de vouloir supprimer ceci ?"
+    delete_confirmation: "Voulez-vous vraiment supprimer ceci ?"
     create_another: "Créer autre %{model}"
     new_model: "Créer %{model}"
     edit_model: "Modifier %{model}"
@@ -69,8 +69,8 @@ fr:
       button_label: "Actions"
     batch_actions:
       button_label: "Actions groupées"
-      default_confirmation: "Êtes-vous sûr de vouloir faire cela ?"
-      delete_confirmation: "Êtes-vous sûr de vouloir supprimer ces %{plural_model} ?"
+      default_confirmation: "Voulez-vous vraiment faire cela ?"
+      delete_confirmation: "Voulez-vous vraiment supprimer ces %{plural_model} ?"
       succesfully_destroyed:
         one: "1 %{model} supprimé"
         other: "%{count} %{plural_model} supprimés"
@@ -86,7 +86,7 @@ fr:
       author: "Auteur"
       add: "Ajouter un commentaire"
       delete: "Supprimer ce commentaire"
-      delete_confirmation: "Êtes-vous sûr de vouloir supprimer ce commentaire ?"
+      delete_confirmation: "Voulez-vous vraiment supprimer ce commentaire ?"
       resource: "Ressource"
       no_comments_yet: "Aucun commentaire actuellement"
       author_missing: "Anonyme"

data/docs/3-index-pages.md

@@ -212,7 +212,7 @@ end
 ```
 
 Scopes can be labelled with a translation, e.g.
-`activerecord.scopes.invoice.expired`.
+`active_admin.scopes.scope_method`.
 
 ### Scopes groups
 

data/docs/9-batch-actions.md

@@ -154,13 +154,13 @@ batch_action :doit, form: -> { {user: User.pluck(:name, :id)} } do |ids, inputs|
 end
 ```
 
-Under the covers this is powered by the JS `ActiveAdmin.modal_dialog` which you
+Under the covers this is powered by the JS `ActiveAdmin.ModalDialog` which you
 can use yourself:
 
 ```coffee
 if $('body.admin_users').length
   $('a[data-prompt]').click ->
-    ActiveAdmin.modal_dialog $(@).data('prompt'), comment: 'textarea',
+    ActiveAdmin.ModalDialog $(@).data('prompt'), comment: 'textarea',
       (inputs)=>
         $.post "/admin/users/#{$(@).data 'id'}/change_state",
           comment: inputs.comment, state: $(@).data('state'),

data/docs/Gemfile.lock

@@ -1,11 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.11.1)
-      i18n (~> 0.7)
+    activesupport (6.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     coffee-script (2.4.1)
@@ -25,33 +26,32 @@ GEM
       ffi (>= 1.3.0)
     eventmachine (1.2.7)
     execjs (2.7.0)
-    faraday (0.17.0)
+    faraday (0.17.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.11.1)
+    ffi (1.11.3)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
-    github-pages (202)
-      activesupport (= 4.2.11.1)
+    github-pages (203)
       github-pages-health-check (= 1.16.1)
       jekyll (= 3.8.5)
-      jekyll-avatar (= 0.6.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.11.0)
+      jekyll-feed (= 0.13.0)
       jekyll-gist (= 1.5.0)
       jekyll-github-metadata (= 2.12.1)
-      jekyll-mentions (= 1.4.1)
-      jekyll-optional-front-matter (= 0.3.0)
+      jekyll-mentions (= 1.5.1)
+      jekyll-optional-front-matter (= 0.3.2)
       jekyll-paginate (= 1.1.0)
-      jekyll-readme-index (= 0.2.0)
-      jekyll-redirect-from (= 0.14.0)
-      jekyll-relative-links (= 0.6.0)
-      jekyll-remote-theme (= 0.4.0)
+      jekyll-readme-index (= 0.3.0)
+      jekyll-redirect-from (= 0.15.0)
+      jekyll-relative-links (= 0.6.1)
+      jekyll-remote-theme (= 0.4.1)
       jekyll-sass-converter (= 1.5.2)
-      jekyll-seo-tag (= 2.5.0)
-      jekyll-sitemap (= 1.2.0)
-      jekyll-swiss (= 0.4.0)
+      jekyll-seo-tag (= 2.6.1)
+      jekyll-sitemap (= 1.4.0)
+      jekyll-swiss (= 1.0.0)
       jekyll-theme-architect (= 0.1.1)
       jekyll-theme-cayman (= 0.1.1)
       jekyll-theme-dinky (= 0.1.1)
@@ -61,19 +61,18 @@ GEM
       jekyll-theme-midnight (= 0.1.1)
       jekyll-theme-minimal (= 0.1.1)
       jekyll-theme-modernist (= 0.1.1)
-      jekyll-theme-primer (= 0.5.3)
+      jekyll-theme-primer (= 0.5.4)
       jekyll-theme-slate (= 0.1.1)
       jekyll-theme-tactile (= 0.1.1)
       jekyll-theme-time-machine (= 0.1.1)
-      jekyll-titles-from-headings (= 0.5.1)
-      jemoji (= 0.10.2)
+      jekyll-titles-from-headings (= 0.5.3)
+      jemoji (= 0.11.1)
       kramdown (= 1.17.0)
-      liquid (= 4.0.0)
-      listen (= 3.1.5)
+      liquid (= 4.0.3)
       mercenary (~> 0.3)
-      minima (= 2.5.0)
+      minima (= 2.5.1)
       nokogiri (>= 1.10.4, < 2.0)
-      rouge (= 3.11.0)
+      rouge (= 3.13.0)
       terminal-table (~> 1.4)
     github-pages-health-check (1.16.1)
       addressable (~> 2.3)
@@ -81,7 +80,7 @@ GEM
       octokit (~> 4.0)
       public_suffix (~> 3.0)
       typhoeus (~> 1.3)
-    html-pipeline (2.12.0)
+    html-pipeline (2.12.2)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
@@ -100,8 +99,8 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-avatar (0.6.0)
-      jekyll (~> 3.0)
+    jekyll-avatar (0.7.0)
+      jekyll (>= 3.0, < 5.0)
     jekyll-coffeescript (1.1.1)
       coffee-script (~> 2.2)
       coffee-script-source (~> 1.11.1)
@@ -114,36 +113,36 @@ GEM
       rouge (>= 2.0, < 4.0)
     jekyll-default-layout (0.1.4)
       jekyll (~> 3.0)
-    jekyll-feed (0.11.0)
-      jekyll (~> 3.3)
+    jekyll-feed (0.13.0)
+      jekyll (>= 3.7, < 5.0)
     jekyll-gist (1.5.0)
       octokit (~> 4.2)
     jekyll-github-metadata (2.12.1)
       jekyll (~> 3.4)
       octokit (~> 4.0, != 4.4.0)
-    jekyll-mentions (1.4.1)
+    jekyll-mentions (1.5.1)
       html-pipeline (~> 2.3)
-      jekyll (~> 3.0)
-    jekyll-optional-front-matter (0.3.0)
-      jekyll (~> 3.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-optional-front-matter (0.3.2)
+      jekyll (>= 3.0, < 5.0)
     jekyll-paginate (1.1.0)
-    jekyll-readme-index (0.2.0)
-      jekyll (~> 3.0)
-    jekyll-redirect-from (0.14.0)
-      jekyll (~> 3.3)
-    jekyll-relative-links (0.6.0)
-      jekyll (~> 3.3)
-    jekyll-remote-theme (0.4.0)
+    jekyll-readme-index (0.3.0)
+      jekyll (>= 3.0, < 5.0)
+    jekyll-redirect-from (0.15.0)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-relative-links (0.6.1)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-remote-theme (0.4.1)
       addressable (~> 2.0)
-      jekyll (~> 3.5)
-      rubyzip (>= 1.2.1, < 3.0)
+      jekyll (>= 3.5, < 5.0)
+      rubyzip (>= 1.3.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
-    jekyll-seo-tag (2.5.0)
-      jekyll (~> 3.3)
-    jekyll-sitemap (1.2.0)
-      jekyll (~> 3.3)
-    jekyll-swiss (0.4.0)
+    jekyll-seo-tag (2.6.1)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-sitemap (1.4.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-swiss (1.0.0)
     jekyll-theme-architect (0.1.1)
       jekyll (~> 3.5)
       jekyll-seo-tag (~> 2.0)
@@ -171,8 +170,8 @@ GEM
     jekyll-theme-modernist (0.1.1)
       jekyll (~> 3.5)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-primer (0.5.3)
-      jekyll (~> 3.5)
+    jekyll-theme-primer (0.5.4)
+      jekyll (> 3.5, < 5.0)
       jekyll-github-metadata (~> 2.9)
       jekyll-seo-tag (~> 2.0)
     jekyll-theme-slate (0.1.1)
@@ -184,29 +183,28 @@ GEM
     jekyll-theme-time-machine (0.1.1)
       jekyll (~> 3.5)
       jekyll-seo-tag (~> 2.0)
-    jekyll-titles-from-headings (0.5.1)
-      jekyll (~> 3.3)
+    jekyll-titles-from-headings (0.5.3)
+      jekyll (>= 3.3, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jemoji (0.10.2)
+    jemoji (0.11.1)
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
-      jekyll (~> 3.0)
+      jekyll (>= 3.0, < 5.0)
     kramdown (1.17.0)
-    liquid (4.0.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
+    liquid (4.0.3)
+    listen (3.2.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
     mini_portile2 (2.4.0)
-    minima (2.5.0)
-      jekyll (~> 3.5)
+    minima (2.5.1)
+      jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.12.2)
+    minitest (5.13.0)
     multipart-post (2.1.1)
-    nokogiri (1.10.5)
+    nokogiri (1.10.6)
       mini_portile2 (~> 2.4.0)
     octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
@@ -216,10 +214,9 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    rouge (3.11.0)
+    rouge (3.13.0)
     ruby-enum (0.7.2)
       i18n
-    ruby_dep (1.5.0)
     rubyzip (2.0.0)
     safe_yaml (1.0.5)
     sass (3.7.4)
@@ -238,6 +235,7 @@ GEM
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unicode-display_width (1.6.0)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby

data/lib/active_admin/inputs/filters/date_range_input.rb

@@ -22,17 +22,20 @@ module ActiveAdmin
           column && column.type == :date ? "#{method}_lteq" : "#{method}_lteq_datetime"
         end
 
-        def input_html_options_for(input_name = gt_input_name, placeholder = gt_input_placeholder)
-          current_value = begin
-            #cast value to date object before rendering input
-            @object.public_send(input_name).to_s.to_date
-          rescue
-            nil
-          end
+        def input_html_options
           { size: 12,
             class: "datepicker",
-            maxlength: 10,
-            placeholder: placeholder,
+            maxlength: 10 }.merge(options[:input_html] || {})
+        end
+
+        def input_html_options_for(input_name, placeholder)
+          current_value = begin
+                            #cast value to date object before rendering input
+                            @object.public_send(input_name).to_s.to_date
+                          rescue
+                            nil
+                          end
+          { placeholder: placeholder,
             value: current_value ? current_value.strftime("%Y-%m-%d") : "" }.merge(input_html_options)
         end
 

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 end

data/lib/active_admin/views/pages/base.rb

@@ -85,8 +85,10 @@ module ActiveAdmin
 
         def build_flash_messages
           div class: 'flashes' do
-            flash_messages.each do |type, message|
-              div message, class: "flash flash_#{type}"
+            flash_messages.each do |type, messages|
+              [*messages].each do |message|
+                div message, class: "flash flash_#{type}"
+              end
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Charles Maresh
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-26 00:00:00.000000000 Z
+date: 2019-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -599,7 +599,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.1
 signing_key: 
 specification_version: 4
 summary: Active Admin is a Ruby on Rails plugin for generating administration style