activeadmin 2.6.1 → 2.9.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of activeadmin might be problematic. Click here for more details.

Files changed (145) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +119 -8
  3. data/CONTRIBUTING.md +8 -24
  4. data/README.md +4 -4
  5. data/app/assets/javascripts/active_admin/base.js +14 -16
  6. data/app/assets/stylesheets/active_admin/_header.scss +37 -3
  7. data/app/assets/stylesheets/active_admin/components/_comments.scss +2 -2
  8. data/app/assets/stylesheets/active_admin/mixins/_variables.scss +3 -0
  9. data/app/javascript/active_admin/initializers/per-page.js +1 -1
  10. data/app/javascript/active_admin/lib/checkbox-toggler.js +3 -3
  11. data/app/javascript/active_admin/lib/dropdown-menu.js +1 -1
  12. data/app/javascript/active_admin/lib/modal-dialog.js +7 -7
  13. data/app/javascript/active_admin/lib/per-page.js +1 -1
  14. data/app/javascript/active_admin/lib/table-checkbox-toggler.js +1 -1
  15. data/app/views/active_admin/devise/mailer/reset_password_instructions.html.erb +1 -1
  16. data/app/views/active_admin/devise/mailer/unlock_instructions.html.erb +2 -2
  17. data/app/views/layouts/active_admin_logged_out.html.erb +15 -5
  18. data/config/locales/ar.yml +6 -6
  19. data/config/locales/es-MX.yml +2 -1
  20. data/config/locales/es.yml +2 -2
  21. data/config/locales/it.yml +18 -0
  22. data/config/locales/ja.yml +3 -3
  23. data/config/locales/vi.yml +5 -5
  24. data/docs/0-installation.md +26 -2
  25. data/docs/11-decorators.md +16 -5
  26. data/docs/2-resource-customization.md +10 -1
  27. data/docs/5-forms.md +6 -1
  28. data/docs/6-show-pages.md +12 -0
  29. data/docs/Gemfile +2 -2
  30. data/docs/Gemfile.lock +52 -41
  31. data/docs/_includes/top-menu.html +1 -1
  32. data/docs/documentation.md +1 -1
  33. data/docs/index.html +6 -6
  34. data/lib/active_admin.rb +59 -60
  35. data/lib/active_admin/application.rb +13 -13
  36. data/lib/active_admin/application_settings.rb +3 -3
  37. data/lib/active_admin/authorization_adapter.rb +3 -3
  38. data/lib/active_admin/base_controller.rb +4 -4
  39. data/lib/active_admin/base_controller/authorization.rb +13 -12
  40. data/lib/active_admin/batch_actions/controller.rb +3 -3
  41. data/lib/active_admin/batch_actions/resource_extension.rb +9 -8
  42. data/lib/active_admin/batch_actions/views/batch_action_form.rb +3 -3
  43. data/lib/active_admin/batch_actions/views/batch_action_selector.rb +6 -6
  44. data/lib/active_admin/batch_actions/views/selection_cells.rb +3 -3
  45. data/lib/active_admin/cancan_adapter.rb +1 -1
  46. data/lib/active_admin/collection_decorator.rb +31 -0
  47. data/lib/active_admin/csv_builder.rb +4 -4
  48. data/lib/active_admin/dependency.rb +11 -11
  49. data/lib/active_admin/devise.rb +5 -5
  50. data/lib/active_admin/dsl.rb +1 -1
  51. data/lib/active_admin/dynamic_settings_node.rb +2 -2
  52. data/lib/active_admin/engine.rb +10 -8
  53. data/lib/active_admin/error.rb +0 -2
  54. data/lib/active_admin/filters.rb +7 -7
  55. data/lib/active_admin/filters/active.rb +1 -1
  56. data/lib/active_admin/filters/active_filter.rb +5 -6
  57. data/lib/active_admin/filters/active_sidebar.rb +5 -5
  58. data/lib/active_admin/filters/forms.rb +6 -6
  59. data/lib/active_admin/filters/formtastic_addons.rb +1 -6
  60. data/lib/active_admin/filters/resource_extension.rb +1 -1
  61. data/lib/active_admin/form_builder.rb +24 -20
  62. data/lib/active_admin/generators/boilerplate.rb +1 -1
  63. data/lib/active_admin/helpers/optional_display.rb +2 -2
  64. data/lib/active_admin/inputs/datepicker_input.rb +1 -1
  65. data/lib/active_admin/inputs/filters/base.rb +1 -1
  66. data/lib/active_admin/inputs/filters/base/search_method_select.rb +4 -4
  67. data/lib/active_admin/inputs/filters/boolean_input.rb +1 -1
  68. data/lib/active_admin/inputs/filters/check_boxes_input.rb +1 -1
  69. data/lib/active_admin/inputs/filters/select_input.rb +2 -2
  70. data/lib/active_admin/localizers.rb +1 -1
  71. data/lib/active_admin/localizers/resource_localizer.rb +3 -3
  72. data/lib/active_admin/menu.rb +6 -3
  73. data/lib/active_admin/menu_item.rb +7 -7
  74. data/lib/active_admin/namespace.rb +12 -12
  75. data/lib/active_admin/namespace_settings.rb +8 -5
  76. data/lib/active_admin/order_clause.rb +1 -1
  77. data/lib/active_admin/orm/active_record.rb +1 -1
  78. data/lib/active_admin/orm/active_record/comments.rb +19 -19
  79. data/lib/active_admin/orm/active_record/comments/comment.rb +3 -3
  80. data/lib/active_admin/orm/active_record/comments/views.rb +2 -2
  81. data/lib/active_admin/orm/active_record/comments/views/active_admin_comments.rb +19 -19
  82. data/lib/active_admin/page.rb +1 -1
  83. data/lib/active_admin/pundit_adapter.rb +5 -5
  84. data/lib/active_admin/resource.rb +17 -17
  85. data/lib/active_admin/resource/action_items.rb +5 -5
  86. data/lib/active_admin/resource/attributes.rb +1 -1
  87. data/lib/active_admin/resource/belongs_to.rb +2 -2
  88. data/lib/active_admin/resource/controllers.rb +1 -1
  89. data/lib/active_admin/resource/menu.rb +4 -4
  90. data/lib/active_admin/resource/naming.rb +4 -4
  91. data/lib/active_admin/resource/routes.rb +5 -7
  92. data/lib/active_admin/resource/scope_to.rb +7 -7
  93. data/lib/active_admin/resource/sidebars.rb +1 -1
  94. data/lib/active_admin/resource_controller.rb +12 -11
  95. data/lib/active_admin/resource_controller/data_access.rb +1 -1
  96. data/lib/active_admin/resource_controller/decorators.rb +6 -28
  97. data/lib/active_admin/resource_controller/streaming.rb +7 -6
  98. data/lib/active_admin/resource_dsl.rb +5 -5
  99. data/lib/active_admin/scope.rb +6 -6
  100. data/lib/active_admin/version.rb +1 -1
  101. data/lib/active_admin/view_factory.rb +17 -17
  102. data/lib/active_admin/view_helpers.rb +1 -1
  103. data/lib/active_admin/view_helpers/breadcrumb_helper.rb +3 -3
  104. data/lib/active_admin/view_helpers/display_helper.rb +5 -5
  105. data/lib/active_admin/view_helpers/download_format_links_helper.rb +1 -1
  106. data/lib/active_admin/view_helpers/fields_for.rb +2 -2
  107. data/lib/active_admin/views.rb +1 -1
  108. data/lib/active_admin/views/components/active_admin_form.rb +5 -5
  109. data/lib/active_admin/views/components/attributes_table.rb +5 -5
  110. data/lib/active_admin/views/components/blank_slate.rb +1 -1
  111. data/lib/active_admin/views/components/dropdown_menu.rb +8 -8
  112. data/lib/active_admin/views/components/index_list.rb +3 -3
  113. data/lib/active_admin/views/components/menu.rb +1 -1
  114. data/lib/active_admin/views/components/menu_item.rb +4 -4
  115. data/lib/active_admin/views/components/paginated_collection.rb +18 -18
  116. data/lib/active_admin/views/components/panel.rb +1 -1
  117. data/lib/active_admin/views/components/scopes.rb +7 -5
  118. data/lib/active_admin/views/components/site_title.rb +1 -1
  119. data/lib/active_admin/views/components/status_tag.rb +11 -11
  120. data/lib/active_admin/views/components/table_for.rb +17 -17
  121. data/lib/active_admin/views/components/tabs.rb +3 -3
  122. data/lib/active_admin/views/footer.rb +2 -1
  123. data/lib/active_admin/views/header.rb +2 -2
  124. data/lib/active_admin/views/index_as_blog.rb +1 -1
  125. data/lib/active_admin/views/index_as_grid.rb +1 -1
  126. data/lib/active_admin/views/index_as_table.rb +16 -16
  127. data/lib/active_admin/views/pages/base.rb +10 -8
  128. data/lib/active_admin/views/pages/index.rb +14 -13
  129. data/lib/active_admin/views/tabbed_navigation.rb +2 -2
  130. data/lib/active_admin/views/title_bar.rb +1 -1
  131. data/lib/activeadmin.rb +1 -1
  132. data/lib/generators/active_admin/assets/assets_generator.rb +2 -2
  133. data/lib/generators/active_admin/assets/templates/active_admin.scss +2 -2
  134. data/lib/generators/active_admin/devise/devise_generator.rb +5 -5
  135. data/lib/generators/active_admin/install/install_generator.rb +14 -8
  136. data/lib/generators/active_admin/install/templates/active_admin.rb.erb +9 -2
  137. data/lib/generators/active_admin/page/page_generator.rb +1 -1
  138. data/lib/generators/active_admin/resource/resource_generator.rb +3 -3
  139. data/lib/generators/active_admin/webpacker/plugins/jquery.js +7 -0
  140. data/lib/generators/active_admin/webpacker/templates/active_admin.js +5 -0
  141. data/lib/generators/active_admin/webpacker/templates/active_admin.scss +17 -0
  142. data/lib/generators/active_admin/webpacker/templates/print.scss +2 -0
  143. data/lib/generators/active_admin/webpacker/webpacker_generator.rb +26 -0
  144. data/lib/ransack_ext.rb +8 -8
  145. metadata +22 -44
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8ce87c19dbaccfc28fd5c36d12f1ef679772a70bd1ae8a131182d277d3de4cb3
4
- data.tar.gz: d0b56716796cb013d8d874280366d8fb424366ee3979bf6549585ef505836d79
3
+ metadata.gz: 3a79fadc45ea60de060d130d9ce18ca04b0becd14baae2e46b3749b76cb7bd20
4
+ data.tar.gz: 59ecfb3dba085bd66b2534991dcba8e14dae2f76a07baae37f8b8daaa4063917
5
5
  SHA512:
6
- metadata.gz: fcda92e560081295c175f08b876594a5bc3ea38cfcb523a15e803a086c97306574801d279ffc2f553902a4aaf2e77eece4b4e065bb26a11f12e031b2d0a94257
7
- data.tar.gz: ca2e295171c638b40f376bf8fd56a7027c79d08a063b534a666b9761e5f4102b436bfc34cc99b3cf8bab7a12a586fe7c702f62661a885f1291974efb73b14490
6
+ metadata.gz: 2d26b7fb0ffbd1da98ca7b4f685a7c386dcab3f25079f5e16e7926cb1c9ce2060db7ecc27d158608091a178590c9604b33850d5f44009401bee467c6f84811a0
7
+ data.tar.gz: 1273181e98620f7af30434e4fb669d95eddfa7633d3e5fb5b51fbb31bf8d8b7615e07c413590cba13b86b5fc1e087dc589f7f4f227c6ff62c4ea25925faf07f8
data/CHANGELOG.md CHANGED
@@ -2,7 +2,77 @@
2
2
 
3
3
  ## Unreleased
4
4
 
5
- ## 2.6.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.6.0..2.6.1)
5
+ ## 2.9.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.8.1..v2.9.0)
6
+
7
+ ### Enhancements
8
+
9
+ * Support for Rails 6.1. [#6548] by [@deivid-rodriguez]
10
+ * Add ability to override "Remove" button text on has_many forms. [#6523] by [@littleforest]
11
+ * Drop git in gemspec. [#6462] by [@utkarsh2102]
12
+
13
+ ### Bug Fixes
14
+
15
+ * Pick up upstream fixes in devise templates. [#6536] by [@munen]
16
+
17
+ ### Documentation
18
+
19
+ * Fix `has_many` syntax in forms documentation. [#6583] by [@krzcho]
20
+ * Add example of using `default_main_content` in show pages. [#6487] by [@sjieg]
21
+
22
+ ### Dependency Changes
23
+
24
+ * Remove sassc and sprockets runtime dependencies. [#6584] by [@deivid-rodriguez]
25
+
26
+ ## 2.8.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.8.0..v2.8.1)
27
+
28
+ ### Bug Fixes
29
+
30
+ * Fix `permitted_param` generation for `belongs_to` when `:param` is used. [#6460] by [@deivid-rodriguez]
31
+ * Fix streaming CSV export. [#6451] by [@deivid-rodriguez]
32
+ * Fix input string filter no rendering dropdown input when its column name ends with a ransack predicate. [#6422] by [@Fivell]
33
+
34
+ ## 2.8.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.7.0..v2.8.0)
35
+
36
+ ### Enhancements
37
+
38
+ * Allow using PORO decorators. [#6249] by [@brunvez]
39
+ * Make sure `ActiveAdmin.routes` provides routes in a consistent order. [#6124] by [@jiikko]
40
+ * Use proper closing tags for HTML in ModalDialog component. [#6221] by [@javierjulio]
41
+
42
+ ### Bug Fixes
43
+
44
+ * Fix comment layout so regardless of size, each is aligned and spaced evenly. [#6393] by [@Ivanov-Anton]
45
+
46
+ ### Translation Improvements
47
+
48
+ * Fix several Arabic translations. [#6368] by [@mshalaby]
49
+ * Add missing `scope/all` italian translation. [#6341] by [@fuzziness]
50
+ * Improve Japanese translation. [#6315] by [@rn0rno]
51
+ * Fix es and es-MX sign_in and sign_up translation. [#6210] by [@roramirez]
52
+
53
+ ### Documentation
54
+
55
+ * Fix filter_columns_for_large_association and filter_method_for_large_association examples. [#6232] by [@ndbroadbent]
56
+
57
+ ### Dependency Changes
58
+
59
+ * Allow formtastic 4. [#6318] by [@deivid-rodriguez]
60
+ * Drop Ruby 2.4 support. [#6198] by [@deivid-rodriguez]
61
+
62
+ ## 2.7.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.6.1..v2.7.0)
63
+
64
+ ### Enhancements
65
+
66
+ * Extend menu to allow for nested submenus. [#5994] by [@taralbass]
67
+ * Add Webpacker compatibility with opt-in config switch and installation generator. [#5855] by [@sgara]
68
+
69
+ ### Bug Fixes
70
+
71
+ * Fix scopes renderer when resource has only optional scopes and their conditions are false. [#6149] by [@Looooong]
72
+ * Fix some missing wrapper markup in "logged out" layout. [#6086] by [@irmela]
73
+ * Fix some typos in Vietnamese translation. [#6099] by [@giapnhdev]
74
+
75
+ ## 2.6.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.6.0..v2.6.1)
6
76
 
7
77
  ### Bug Fixes
8
78
 
@@ -13,7 +83,7 @@
13
83
 
14
84
  ## 2.6.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.5.0..v2.6.0)
15
85
 
16
- ### Enhacements
86
+ ### Enhancements
17
87
 
18
88
  * Display multiple flash messages in separate elements. [#5929] by [@mirelon]
19
89
  * Make delete confirmation messages in French & Spanish gender-neutral. [#5946] by [@cprodhomme]
@@ -507,15 +577,16 @@ Please check [0-6-stable] for previous changes.
507
577
  [#5504]: https://github.com/activeadmin/activeadmin/pull/5504
508
578
  [#5517]: https://github.com/activeadmin/activeadmin/pull/5517
509
579
  [#5537]: https://github.com/activeadmin/activeadmin/pull/5537
580
+ [#5548]: https://github.com/activeadmin/activeadmin/pull/5548
510
581
  [#5555]: https://github.com/activeadmin/activeadmin/pull/5555
511
582
  [#5583]: https://github.com/activeadmin/activeadmin/pull/5583
583
+ [#5590]: https://github.com/activeadmin/activeadmin/pull/5590
512
584
  [#5608]: https://github.com/activeadmin/activeadmin/pull/5608
513
585
  [#5611]: https://github.com/activeadmin/activeadmin/pull/5611
514
586
  [#5627]: https://github.com/activeadmin/activeadmin/pull/5627
515
587
  [#5631]: https://github.com/activeadmin/activeadmin/pull/5631
516
588
  [#5632]: https://github.com/activeadmin/activeadmin/pull/5632
517
589
  [#5650]: https://github.com/activeadmin/activeadmin/pull/5650
518
- [#5590]: https://github.com/activeadmin/activeadmin/pull/5590
519
590
  [#5662]: https://github.com/activeadmin/activeadmin/pull/5662
520
591
  [#5710]: https://github.com/activeadmin/activeadmin/pull/5710
521
592
  [#5726]: https://github.com/activeadmin/activeadmin/pull/5726
@@ -533,27 +604,52 @@ Please check [0-6-stable] for previous changes.
533
604
  [#5822]: https://github.com/activeadmin/activeadmin/pull/5822
534
605
  [#5826]: https://github.com/activeadmin/activeadmin/pull/5826
535
606
  [#5831]: https://github.com/activeadmin/activeadmin/pull/5831
536
- [#5548]: https://github.com/activeadmin/activeadmin/pull/5548
537
607
  [#5842]: https://github.com/activeadmin/activeadmin/pull/5842
538
608
  [#5854]: https://github.com/activeadmin/activeadmin/pull/5854
609
+ [#5855]: https://github.com/activeadmin/activeadmin/pull/5855
610
+ [#5867]: https://github.com/activeadmin/activeadmin/pull/5867
611
+ [#5870]: https://github.com/activeadmin/activeadmin/pull/5870
539
612
  [#5874]: https://github.com/activeadmin/activeadmin/pull/5874
540
613
  [#5877]: https://github.com/activeadmin/activeadmin/pull/5877
541
614
  [#5886]: https://github.com/activeadmin/activeadmin/pull/5886
542
- [#5870]: https://github.com/activeadmin/activeadmin/pull/5870
615
+ [#5887]: https://github.com/activeadmin/activeadmin/pull/5887
543
616
  [#5894]: https://github.com/activeadmin/activeadmin/pull/5894
544
617
  [#5895]: https://github.com/activeadmin/activeadmin/pull/5895
545
- [#5867]: https://github.com/activeadmin/activeadmin/pull/5867
546
- [#5887]: https://github.com/activeadmin/activeadmin/pull/5887
618
+ [#5929]: https://github.com/activeadmin/activeadmin/pull/5929
547
619
  [#5931]: https://github.com/activeadmin/activeadmin/pull/5931
548
620
  [#5938]: https://github.com/activeadmin/activeadmin/pull/5938
549
- [#5929]: https://github.com/activeadmin/activeadmin/pull/5929
550
621
  [#5943]: https://github.com/activeadmin/activeadmin/pull/5943
551
622
  [#5946]: https://github.com/activeadmin/activeadmin/pull/5946
552
623
  [#5956]: https://github.com/activeadmin/activeadmin/pull/5956
553
624
  [#5957]: https://github.com/activeadmin/activeadmin/pull/5957
625
+ [#5994]: https://github.com/activeadmin/activeadmin/pull/5994
554
626
  [#6000]: https://github.com/activeadmin/activeadmin/pull/6000
555
627
  [#6002]: https://github.com/activeadmin/activeadmin/pull/6002
556
628
  [#6047]: https://github.com/activeadmin/activeadmin/pull/6047
629
+ [#6086]: https://github.com/activeadmin/activeadmin/pull/6086
630
+ [#6099]: https://github.com/activeadmin/activeadmin/pull/6099
631
+ [#6124]: https://github.com/activeadmin/activeadmin/pull/6124
632
+ [#6149]: https://github.com/activeadmin/activeadmin/pull/6149
633
+ [#6198]: https://github.com/activeadmin/activeadmin/pull/6198
634
+ [#6210]: https://github.com/activeadmin/activeadmin/pull/6210
635
+ [#6221]: https://github.com/activeadmin/activeadmin/pull/6221
636
+ [#6232]: https://github.com/activeadmin/activeadmin/pull/6232
637
+ [#6249]: https://github.com/activeadmin/activeadmin/pull/6249
638
+ [#6315]: https://github.com/activeadmin/activeadmin/pull/6315
639
+ [#6318]: https://github.com/activeadmin/activeadmin/pull/6318
640
+ [#6341]: https://github.com/activeadmin/activeadmin/pull/6341
641
+ [#6368]: https://github.com/activeadmin/activeadmin/pull/6368
642
+ [#6393]: https://github.com/activeadmin/activeadmin/pull/6393
643
+ [#6422]: https://github.com/activeadmin/activeadmin/pull/6422
644
+ [#6451]: https://github.com/activeadmin/activeadmin/pull/6451
645
+ [#6460]: https://github.com/activeadmin/activeadmin/pull/6460
646
+ [#6462]: https://github.com/activeadmin/activeadmin/pull/6462
647
+ [#6487]: https://github.com/activeadmin/activeadmin/pull/6487
648
+ [#6523]: https://github.com/activeadmin/activeadmin/pull/6523
649
+ [#6536]: https://github.com/activeadmin/activeadmin/pull/6536
650
+ [#6548]: https://github.com/activeadmin/activeadmin/pull/6548
651
+ [#6583]: https://github.com/activeadmin/activeadmin/pull/6583
652
+ [#6584]: https://github.com/activeadmin/activeadmin/pull/6584
557
653
 
558
654
  [@5t111111]: https://github.com/5t111111
559
655
  [@aarek]: https://github.com/aarek
@@ -566,6 +662,7 @@ Please check [0-6-stable] for previous changes.
566
662
  [@bartoszkopinski]: https://github.com/bartoszkopinski
567
663
  [@blocknotes]: https://github.com/blocknotes
568
664
  [@bolshakov]: https://github.com/bolshakov
665
+ [@brunvez]: https://github.com/brunvez
569
666
  [@buren]: https://github.com/buren
570
667
  [@chancancode]: https://github.com/chancancode
571
668
  [@chrp]: https://github.com/chrp
@@ -584,6 +681,8 @@ Please check [0-6-stable] for previous changes.
584
681
  [@FabioRos]: https://github.com/FabioRos
585
682
  [@faucct]: https://github.com/faucct
586
683
  [@Fivell]: https://github.com/Fivell
684
+ [@fuzziness]: https://github.com/fuzziness
685
+ [@giapnhdev]: https://github.com/giapnhdev
587
686
  [@glebtv]: https://github.com/glebtv
588
687
  [@gonzedge]: https://github.com/gonzedge
589
688
  [@guigs]: https://github.com/guigs
@@ -592,10 +691,12 @@ Please check [0-6-stable] for previous changes.
592
691
  [@innparusu95]: https://github.com/innparusu95
593
692
  [@ionut998]: https://github.com/ionut998
594
693
  [@irmela]: https://github.com/irmela
694
+ [@Ivanov-Anton]: https://github.com/Ivanov-Anton
595
695
  [@jasl]: https://github.com/jasl
596
696
  [@javierjulio]: https://github.com/javierjulio
597
697
  [@jawa]: https://github.com/jawa
598
698
  [@JiiHu]: https://github.com/JiiHu
699
+ [@jiikko]: https://github.com/jiikko
599
700
  [@johnnyshields]: https://github.com/johnnyshields
600
701
  [@jscheid]: https://github.com/jscheid
601
702
  [@juril33t]: https://github.com/juril33t
@@ -604,13 +705,18 @@ Please check [0-6-stable] for previous changes.
604
705
  [@ko-lem]: https://github.com/ko-lem
605
706
  [@kobeumut]: https://github.com/kobeumut
606
707
  [@Kris-LIBIS]: https://github.com/Kris-LIBIS
708
+ [@krzcho]: https://github.com/krzcho
607
709
  [@kwent]: https://github.com/kwent
608
710
  [@leio10]: https://github.com/leio10
711
+ [@littleforest]: https://github.com/littleforest
712
+ [@Looooong]: https://github.com/Looooong
609
713
  [@markstory]: https://github.com/markstory
610
714
  [@mauriciopasquier]: https://github.com/mauriciopasquier
611
715
  [@mconiglio]: https://github.com/mconiglio
612
716
  [@micred]: https://github.com/micred
613
717
  [@mirelon]: https://github.com/mirelon
718
+ [@mshalaby]: https://github.com/mshalaby
719
+ [@munen]: https://github.com/munen
614
720
  [@ndbroadbent]: https://github.com/ndbroadbent
615
721
  [@Nguyenanh]: https://github.com/Nguyenanh
616
722
  [@orkhan]: https://github.com/orkhan
@@ -619,18 +725,23 @@ Please check [0-6-stable] for previous changes.
619
725
  [@potatosalad]: https://github.com/potatosalad
620
726
  [@pranas]: https://github.com/pranas
621
727
  [@renotocn]: https://github.com/renotocn
728
+ [@rn0rno]: https://github.com/rn0rno
622
729
  [@RobinvanderVliet]: https://github.com/RobinvanderVliet
623
730
  [@rogerkk]: https://github.com/rogerkk
731
+ [@roramirez]: https://github.com/roramirez
624
732
  [@seanlinsley]: https://github.com/seanlinsley
625
733
  [@sgara]: https://github.com/sgara
626
734
  [@ShallmentMo]: https://github.com/ShallmentMo
627
735
  [@shekibobo]: https://github.com/shekibobo
628
736
  [@shouya]: https://github.com/shouya
737
+ [@sjieg]: https://github.com/sjieg
629
738
  [@stefsava]: https://github.com/stefsava
630
739
  [@stereoscott]: https://github.com/stereoscott
740
+ [@taralbass]: https://github.com/taralbass
631
741
  [@tiagotex]: https://github.com/tiagotex
632
742
  [@timoschilling]: https://github.com/timoschilling
633
743
  [@TimPetricola]: https://github.com/TimPetricola
744
+ [@utkarsh2102]: https://github.com/utkarsh2102
634
745
  [@varyonic]: https://github.com/varyonic
635
746
  [@vcsjones]: https://github.com/vcsjones
636
747
  [@vfonic]: https://github.com/vfonic
data/CONTRIBUTING.md CHANGED
@@ -115,22 +115,6 @@ checks as the rest of the project. `bin/rake lint` will give you feedback in
115
115
  this regard. You can check & fix style issues by running each linter
116
116
  individually. Run `bin/rake -T lint` to see the available linters.
117
117
 
118
- ### Add a changelog entry
119
-
120
- If your PR includes user-observable changes, you'll be asked to add a changelog
121
- entry following the existing changelog format.
122
-
123
- The changelog format is the following:
124
-
125
- * One line per PR describing your fix or enhancement.
126
- * Entries end with a dot, followed by "[#pr-number] by [@github-username]".
127
- * Entries are added under the "Unreleased" section at the top of the file, under
128
- the "Bug Fixes" or "Enhancements" subsection.
129
- * References to github usernames and pull requests use [shortcut reference
130
- links].
131
- * Your github username reference definition is included in the correct
132
- alphabetical position at the bottom of the file.
133
-
134
118
  ### Make a Pull Request
135
119
 
136
120
  At this point, you should switch back to your master branch and make sure it's
@@ -152,12 +136,12 @@ git push --set-upstream origin 325-add-japanese-translations
152
136
 
153
137
  Finally, go to GitHub and [make a Pull Request][] :D
154
138
 
155
- CircleCI will run our test suite against all supported Rails versions. We care
156
- about quality, so your PR won't be merged until all tests pass. It's unlikely,
157
- but it's possible that your changes pass tests in one Rails version but fail in
158
- another. In that case, you'll have to setup your development environment (as
159
- explained in step 3) to use the problematic Rails version, and investigate
160
- what's going on!
139
+ Github Actions will run our test suite against all supported Rails versions. We
140
+ care about quality, so your PR won't be merged until all tests pass. It's
141
+ unlikely, but it's possible that your changes pass tests in one Rails version
142
+ but fail in another. In that case, you'll have to setup your development
143
+ environment (as explained in step 3) to use the problematic Rails version, and
144
+ investigate what's going on!
161
145
 
162
146
  ### Keeping your Pull Request updated
163
147
 
@@ -190,12 +174,12 @@ met.
190
174
 
191
175
  Maintainers need to do the following to push out a release:
192
176
 
193
- * Make sure all pull requests are in and that changelog is current
194
177
  * Switch to the master branch and make sure it's up to date.
195
178
  * Make sure you have [chandler] properly configured. Chandler is used to
196
179
  automatically submit github release notes from the changelog right after
197
180
  pushing the gem to rubygems.
198
181
  * Run one of `bin/rake release:prepare_{prerelease,prepatch,patch,preminor,minor,premajor,major}`, push the result and create a PR.
182
+ * Review and merge the PR. The generated changelog in the PR should include all user visible changes you intend to ship.
199
183
  * Run `bin/rake release` from the target branch once the PR is merged.
200
184
 
201
185
  [chandler]: https://github.com/mattbrictson/chandler#2-configure-credentials
@@ -204,7 +188,7 @@ Maintainers need to do the following to push out a release:
204
188
  [fork Active Admin]: https://help.github.com/articles/fork-a-repo
205
189
  [make a pull request]: https://help.github.com/articles/creating-a-pull-request
206
190
  [git rebasing]: http://git-scm.com/book/en/Git-Branching-Rebasing
207
- [interactive rebase]: https://help.github.com/articles/interactive-rebase
191
+ [interactive rebase]: https://help.github.com/en/github/using-git/about-git-rebase
208
192
  [shortcut reference links]: https://github.github.com/gfm/#shortcut-reference-link
209
193
  [Rollup]: https://rollupjs.org/guide/en/#quick-start
210
194
  [Yarn]: https://yarnpkg.com/en/docs/install
data/README.md CHANGED
@@ -4,7 +4,7 @@
4
4
  creating elegant backends for website administration.
5
5
 
6
6
  [![Version ][rubygems_badge]][rubygems]
7
- [![Circle CI ][circle_badge]][circle]
7
+ [![Github Actions ][actions_badge]][actions]
8
8
  [![Coverage ][coverage_badge]][coverage]
9
9
  [![Tidelift ][tidelift_badge]][tidelift]
10
10
  [![Inch CI ][inch_badge]][inch]
@@ -93,15 +93,15 @@ Thanks to [Open Collective][opencollective contributors] and all our Open Collec
93
93
 
94
94
  [rubygems_badge]: http://img.shields.io/gem/v/activeadmin.svg
95
95
  [rubygems]: https://rubygems.org/gems/activeadmin
96
- [circle_badge]: https://circleci.com/gh/activeadmin/activeadmin/tree/master.svg?style=svg
97
- [circle]: https://circleci.com/gh/activeadmin/activeadmin/tree/master
96
+ [actions_badge]: https://github.com/activeadmin/activeadmin/workflows/ci/badge.svg
97
+ [actions]: https://github.com/activeadmin/activeadmin/actions
98
98
  [coverage_badge]: https://api.codeclimate.com/v1/badges/779e407d22bacff19733/test_coverage
99
99
  [coverage]: https://codeclimate.com/github/activeadmin/activeadmin/test_coverage
100
100
  [inch_badge]: http://inch-ci.org/github/activeadmin/activeadmin.svg?branch=master
101
101
  [inch]: http://inch-ci.org/github/activeadmin/activeadmin
102
102
  [tidelift_badge]: https://tidelift.com/badges/github/activeadmin/activeadmin
103
103
  [tidelift]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=readme
104
- [tidelift_enterprise]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=github&utm_content=enterprise
104
+ [tidelift_enterprise]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=enterprise
105
105
  [tidelift_support]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=github&utm_content=support
106
106
 
107
107
  [docs]: http://activeadmin.info/0-installation.html
@@ -11,7 +11,7 @@
11
11
  //= require_self
12
12
 
13
13
  (function(global, factory) {
14
- 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,
14
+ 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 = typeof globalThis !== "undefined" ? globalThis : global || self,
15
15
  factory(global.ActiveAdmin = {}));
16
16
  })(this, function(exports) {
17
17
  "use strict";
@@ -27,18 +27,17 @@
27
27
  function ModalDialog(message, inputs, callback) {
28
28
  var html = '<form id="dialog_confirm" title="' + message + '"><ul>';
29
29
  for (var name in inputs) {
30
- var elem, opts, wrapper;
30
+ var opts, wrapper;
31
31
  var type = inputs[name];
32
32
  if (/^(datepicker|checkbox|text|number)$/.test(type)) {
33
33
  wrapper = "input";
34
34
  } else if (type === "textarea") {
35
35
  wrapper = "textarea";
36
36
  } else if ($.isArray(type)) {
37
- var _ref = [ "select", "option", type, "" ];
37
+ var _ref = [ "select", type, "" ];
38
38
  wrapper = _ref[0];
39
- elem = _ref[1];
40
- opts = _ref[2];
41
- type = _ref[3];
39
+ opts = _ref[1];
40
+ type = _ref[2];
42
41
  } else {
43
42
  throw new Error("Unsupported input type: {" + name + ": " + type + "}");
44
43
  }
@@ -46,29 +45,28 @@
46
45
  html += "<li>\n <label>" + (name.charAt(0).toUpperCase() + name.slice(1)) + "</label>\n <" + wrapper + ' name="' + name + '" class="' + klass + '" type="' + type + '">' + (opts ? function() {
47
46
  var result = [];
48
47
  opts.forEach(function(v) {
49
- var $elem = $("<" + elem + "/>");
48
+ var $elem = $("<option></option>");
50
49
  if ($.isArray(v)) {
51
50
  $elem.text(v[0]).val(v[1]);
52
51
  } else {
53
52
  $elem.text(v);
54
53
  }
55
- result.push($elem.wrap("<div>").parent().html());
54
+ result.push($elem.wrap("<div></div>").parent().html());
56
55
  });
57
56
  return result;
58
57
  }().join("") : "") + ("</" + wrapper + ">") + "</li>";
59
58
  var _ref2 = [];
60
59
  wrapper = _ref2[0];
61
- elem = _ref2[1];
62
- opts = _ref2[2];
63
- type = _ref2[3];
64
- klass = _ref2[4];
60
+ opts = _ref2[1];
61
+ type = _ref2[2];
62
+ klass = _ref2[3];
65
63
  }
66
64
  html += "</ul></form>";
67
65
  var form = $(html).appendTo("body");
68
66
  $("body").trigger("modal_dialog:before_open", [ form ]);
69
67
  form.dialog({
70
68
  modal: true,
71
- open: function open(event, ui) {
69
+ open: function open(_event, _ui) {
72
70
  $("body").trigger("modal_dialog:after_open", [ form ]);
73
71
  },
74
72
  dialogClass: "active_admin_dialog",
@@ -136,7 +134,7 @@
136
134
  this._bind();
137
135
  }
138
136
  var _proto = CheckboxToggler.prototype;
139
- _proto.option = function option(key, value) {};
137
+ _proto.option = function option(_key, _value) {};
140
138
  _proto._init = function _init() {
141
139
  if (!this.container) {
142
140
  throw new Error("Container element not found");
@@ -159,7 +157,7 @@
159
157
  return _this._didChangeToggleAllCheckbox();
160
158
  });
161
159
  };
162
- _proto._didChangeCheckbox = function _didChangeCheckbox(checkbox) {
160
+ _proto._didChangeCheckbox = function _didChangeCheckbox(_checkbox) {
163
161
  var numChecked = this.checkboxes.filter(":checked").length;
164
162
  var allChecked = numChecked === this.checkboxes.length;
165
163
  var someChecked = numChecked > 0 && numChecked < this.checkboxes.length;
@@ -464,7 +462,7 @@
464
462
  return PerPage;
465
463
  }();
466
464
  (function($) {
467
- $(document).on("change", ".pagination_per_page > select", function(event) {
465
+ $(document).on("change", ".pagination_per_page > select", function(_event) {
468
466
  PerPage._jQueryInterface.call($(this), "update");
469
467
  });
470
468
  $.fn["perPage"] = PerPage._jQueryInterface;
@@ -52,6 +52,11 @@
52
52
  margin: 0;
53
53
  padding: 0;
54
54
 
55
+ li {
56
+ /* Hover on li, display the ul */
57
+ &:hover > ul { display: block;}
58
+ }
59
+
55
60
  & > li {
56
61
  display: inline-block;
57
62
  margin-right: 4px;
@@ -95,8 +100,6 @@
95
100
  }
96
101
 
97
102
 
98
- /* Hover on li, display the ul */
99
- &:hover ul { display: block;}
100
103
  /* Drop down menus */
101
104
  ul {
102
105
  background: $hover-menu-item-background;
@@ -114,6 +117,7 @@
114
117
  z-index: 1010;
115
118
 
116
119
  li {
120
+ position: relative;
117
121
  margin: 0px;
118
122
  a {
119
123
  background: none;
@@ -124,10 +128,40 @@
124
128
  &.current {
125
129
  a { @include rounded(0) }
126
130
  }
131
+
132
+ &.has_nested > a {
133
+ background: url($menu-arrow-right-light-icon-url) no-repeat calc(100% - 7px) 55%;
134
+ padding-right: 20px;
135
+ }
136
+
137
+ &.has_nested:hover > a {
138
+ background: url($menu-arrow-right-dark-icon-url) no-repeat calc(100% - 7px) 55%;
139
+ color: #fff;
140
+ }
141
+
142
+ ul {
143
+ @include rounded-all(10px,10px,10px,10px);
144
+ margin-top: 0;
145
+ top: -3px;
146
+ left: 100%;
147
+
148
+ /* Create an invisible backdrop that adds 8px margin around the dropdown menu or submenu
149
+ that maintains the hover. This makes it much easier to navigate to submenus in
150
+ particular without losing hover accientally, especially near rounded corners. */
151
+ &:after {
152
+ content: "";
153
+ display: block;
154
+ position: absolute;
155
+ top: -8px;
156
+ left: -8px;
157
+ height: calc(100% + 16px);
158
+ width: calc(100% + 16px);
159
+ z-index: -2;
160
+ }
161
+ }
127
162
  }
128
163
  }
129
164
  }
130
-
131
165
  }
132
166
 
133
167
  #tabs {