activeadmin 2.5.0 → 2.8.1

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 (149) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +120 -6
  3. data/CONTRIBUTING.md +11 -57
  4. data/README.md +2 -2
  5. data/app/assets/javascripts/active_admin/base.js +26 -18
  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/base.js +9 -0
  10. data/app/javascript/active_admin/initializers/per-page.js +1 -1
  11. data/app/javascript/active_admin/lib/checkbox-toggler.js +3 -3
  12. data/app/javascript/active_admin/lib/dropdown-menu.js +1 -1
  13. data/app/javascript/active_admin/lib/modal-dialog.js +7 -7
  14. data/app/javascript/active_admin/lib/per-page.js +1 -1
  15. data/app/javascript/active_admin/lib/table-checkbox-toggler.js +1 -1
  16. data/app/views/layouts/active_admin_logged_out.html.erb +15 -5
  17. data/config/locales/ar.yml +6 -6
  18. data/config/locales/en-CA.yml +3 -3
  19. data/config/locales/en-GB.yml +3 -3
  20. data/config/locales/en.yml +3 -3
  21. data/config/locales/es-MX.yml +2 -1
  22. data/config/locales/es.yml +5 -5
  23. data/config/locales/fr.yml +4 -4
  24. data/config/locales/it.yml +18 -0
  25. data/config/locales/ja.yml +3 -3
  26. data/config/locales/lv.yml +2 -2
  27. data/config/locales/vi.yml +6 -5
  28. data/docs/0-installation.md +26 -2
  29. data/docs/11-decorators.md +16 -5
  30. data/docs/2-resource-customization.md +10 -1
  31. data/docs/3-index-pages.md +1 -1
  32. data/docs/9-batch-actions.md +2 -2
  33. data/docs/Gemfile +2 -2
  34. data/docs/Gemfile.lock +93 -84
  35. data/docs/_includes/top-menu.html +1 -1
  36. data/docs/documentation.md +1 -1
  37. data/docs/index.html +6 -6
  38. data/lib/active_admin.rb +60 -60
  39. data/lib/active_admin/application.rb +13 -13
  40. data/lib/active_admin/application_settings.rb +3 -3
  41. data/lib/active_admin/authorization_adapter.rb +3 -3
  42. data/lib/active_admin/base_controller.rb +4 -4
  43. data/lib/active_admin/base_controller/authorization.rb +13 -12
  44. data/lib/active_admin/batch_actions/controller.rb +3 -3
  45. data/lib/active_admin/batch_actions/resource_extension.rb +9 -8
  46. data/lib/active_admin/batch_actions/views/batch_action_form.rb +3 -3
  47. data/lib/active_admin/batch_actions/views/batch_action_selector.rb +6 -6
  48. data/lib/active_admin/batch_actions/views/selection_cells.rb +3 -3
  49. data/lib/active_admin/cancan_adapter.rb +1 -1
  50. data/lib/active_admin/collection_decorator.rb +31 -0
  51. data/lib/active_admin/csv_builder.rb +11 -7
  52. data/lib/active_admin/dependency.rb +11 -11
  53. data/lib/active_admin/devise.rb +5 -5
  54. data/lib/active_admin/dsl.rb +1 -1
  55. data/lib/active_admin/dynamic_settings_node.rb +2 -2
  56. data/lib/active_admin/engine.rb +3 -3
  57. data/lib/active_admin/filters.rb +7 -7
  58. data/lib/active_admin/filters/active.rb +1 -1
  59. data/lib/active_admin/filters/active_filter.rb +5 -4
  60. data/lib/active_admin/filters/active_sidebar.rb +5 -5
  61. data/lib/active_admin/filters/forms.rb +6 -6
  62. data/lib/active_admin/filters/formtastic_addons.rb +1 -6
  63. data/lib/active_admin/filters/resource_extension.rb +1 -1
  64. data/lib/active_admin/form_builder.rb +21 -19
  65. data/lib/active_admin/generators/boilerplate.rb +1 -1
  66. data/lib/active_admin/helpers/optional_display.rb +2 -2
  67. data/lib/active_admin/inputs/datepicker_input.rb +1 -1
  68. data/lib/active_admin/inputs/filters/base.rb +1 -1
  69. data/lib/active_admin/inputs/filters/base/search_method_select.rb +4 -4
  70. data/lib/active_admin/inputs/filters/boolean_input.rb +1 -1
  71. data/lib/active_admin/inputs/filters/check_boxes_input.rb +1 -1
  72. data/lib/active_admin/inputs/filters/date_range_input.rb +12 -9
  73. data/lib/active_admin/inputs/filters/select_input.rb +2 -2
  74. data/lib/active_admin/localizers.rb +1 -1
  75. data/lib/active_admin/localizers/resource_localizer.rb +3 -3
  76. data/lib/active_admin/menu.rb +6 -3
  77. data/lib/active_admin/menu_item.rb +7 -7
  78. data/lib/active_admin/namespace.rb +12 -12
  79. data/lib/active_admin/namespace_settings.rb +8 -5
  80. data/lib/active_admin/order_clause.rb +1 -1
  81. data/lib/active_admin/orm/active_record.rb +1 -1
  82. data/lib/active_admin/orm/active_record/comments.rb +19 -19
  83. data/lib/active_admin/orm/active_record/comments/comment.rb +3 -3
  84. data/lib/active_admin/orm/active_record/comments/views.rb +2 -2
  85. data/lib/active_admin/orm/active_record/comments/views/active_admin_comments.rb +19 -19
  86. data/lib/active_admin/page.rb +1 -1
  87. data/lib/active_admin/pundit_adapter.rb +5 -5
  88. data/lib/active_admin/resource.rb +17 -17
  89. data/lib/active_admin/resource/action_items.rb +5 -5
  90. data/lib/active_admin/resource/attributes.rb +1 -1
  91. data/lib/active_admin/resource/belongs_to.rb +2 -2
  92. data/lib/active_admin/resource/controllers.rb +1 -1
  93. data/lib/active_admin/resource/menu.rb +4 -4
  94. data/lib/active_admin/resource/naming.rb +5 -5
  95. data/lib/active_admin/resource/routes.rb +5 -5
  96. data/lib/active_admin/resource/scope_to.rb +7 -7
  97. data/lib/active_admin/resource/sidebars.rb +1 -1
  98. data/lib/active_admin/resource_controller.rb +12 -11
  99. data/lib/active_admin/resource_controller/data_access.rb +1 -1
  100. data/lib/active_admin/resource_controller/decorators.rb +6 -26
  101. data/lib/active_admin/resource_controller/streaming.rb +7 -6
  102. data/lib/active_admin/resource_dsl.rb +5 -5
  103. data/lib/active_admin/scope.rb +6 -6
  104. data/lib/active_admin/version.rb +1 -1
  105. data/lib/active_admin/view_factory.rb +17 -17
  106. data/lib/active_admin/view_helpers.rb +1 -1
  107. data/lib/active_admin/view_helpers/breadcrumb_helper.rb +3 -3
  108. data/lib/active_admin/view_helpers/display_helper.rb +5 -5
  109. data/lib/active_admin/view_helpers/download_format_links_helper.rb +1 -1
  110. data/lib/active_admin/view_helpers/fields_for.rb +2 -2
  111. data/lib/active_admin/views.rb +1 -1
  112. data/lib/active_admin/views/components/active_admin_form.rb +5 -5
  113. data/lib/active_admin/views/components/attributes_table.rb +5 -5
  114. data/lib/active_admin/views/components/blank_slate.rb +1 -1
  115. data/lib/active_admin/views/components/dropdown_menu.rb +8 -8
  116. data/lib/active_admin/views/components/index_list.rb +3 -3
  117. data/lib/active_admin/views/components/menu.rb +1 -1
  118. data/lib/active_admin/views/components/menu_item.rb +4 -4
  119. data/lib/active_admin/views/components/paginated_collection.rb +18 -18
  120. data/lib/active_admin/views/components/panel.rb +1 -1
  121. data/lib/active_admin/views/components/scopes.rb +7 -5
  122. data/lib/active_admin/views/components/site_title.rb +1 -1
  123. data/lib/active_admin/views/components/status_tag.rb +11 -11
  124. data/lib/active_admin/views/components/table_for.rb +17 -17
  125. data/lib/active_admin/views/components/tabs.rb +3 -3
  126. data/lib/active_admin/views/footer.rb +2 -1
  127. data/lib/active_admin/views/header.rb +2 -2
  128. data/lib/active_admin/views/index_as_blog.rb +1 -1
  129. data/lib/active_admin/views/index_as_grid.rb +1 -1
  130. data/lib/active_admin/views/index_as_table.rb +16 -16
  131. data/lib/active_admin/views/pages/base.rb +14 -10
  132. data/lib/active_admin/views/pages/index.rb +14 -13
  133. data/lib/active_admin/views/tabbed_navigation.rb +2 -2
  134. data/lib/active_admin/views/title_bar.rb +1 -1
  135. data/lib/activeadmin.rb +1 -1
  136. data/lib/generators/active_admin/assets/assets_generator.rb +2 -2
  137. data/lib/generators/active_admin/assets/templates/active_admin.scss +2 -2
  138. data/lib/generators/active_admin/devise/devise_generator.rb +5 -5
  139. data/lib/generators/active_admin/install/install_generator.rb +14 -8
  140. data/lib/generators/active_admin/install/templates/active_admin.rb.erb +9 -2
  141. data/lib/generators/active_admin/page/page_generator.rb +1 -1
  142. data/lib/generators/active_admin/resource/resource_generator.rb +3 -3
  143. data/lib/generators/active_admin/webpacker/plugins/jquery.js +7 -0
  144. data/lib/generators/active_admin/webpacker/templates/active_admin.js +5 -0
  145. data/lib/generators/active_admin/webpacker/templates/active_admin.scss +17 -0
  146. data/lib/generators/active_admin/webpacker/templates/print.scss +2 -0
  147. data/lib/generators/active_admin/webpacker/webpacker_generator.rb +26 -0
  148. data/lib/ransack_ext.rb +8 -8
  149. metadata +20 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7d4b2286091c361bd4e0e7b408ed7e4f6bf3aa118492ed037cb51b2f6e882cf4
4
- data.tar.gz: b9381cb429a6ccfda90d0a51f646c759843c387bda107dcb3d66cffa26cd083f
3
+ metadata.gz: d5319bddf9e28d0adf5521d932bfb6b1a27bb8a0f0b84116bf5014148fe04ef8
4
+ data.tar.gz: 4b41ed99a504af4c5c82f84a959c16a6efa703f09970c4e61b0fc9dd48dbccea
5
5
  SHA512:
6
- metadata.gz: 8dba7ffe9ed0516ebfc0f484d548962d677d9d6a36cbf097c0e76e06db7ef87c0469791fdb7917ddd2b831927225958107a16aab3cd096f1ffbf8bc49ebf697d
7
- data.tar.gz: d9dd9f7295fe4f0ccc852ab375637578c86621bd30435d62f2c7d7754ccb5693910aa39e0a154fdbd5535613b3f829ef31a8520761162006e12755e85db9dabb
6
+ metadata.gz: c15f0a18dab4b6dd28c433d4481c18fc00a406dbad22f397035ad1dcd5fdff5a7e11018bc39fd15af3e92644a94d311b39a6268ff625e5b6c1372424807a8ced
7
+ data.tar.gz: 444c6aac584a1a13131cdf7b2f1f6c4f2d5a6d4a565c1dee172944837960297223e661534f502e2a1f3624606b9b083337625cd2b2db4eaf0dae357b42f466bd
@@ -2,6 +2,77 @@
2
2
 
3
3
  ## Unreleased
4
4
 
5
+ ## 2.8.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.8.0..v2.8.1)
6
+
7
+ ### Bug Fixes
8
+
9
+ * Fix `permitted_param` generation for `belongs_to` when `:param` is used. [#6460] by [@deivid-rodriguez]
10
+ * Fix streaming CSV export. [#6451] by [@deivid-rodriguez]
11
+ * Fix input string filter no rendering dropdown input when its column name ends with a ransack predicate. [#6422] by [@Fivell]
12
+
13
+ ## 2.8.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.7.0..v2.8.0)
14
+
15
+ ### Enhancements
16
+
17
+ * Allow using PORO decorators. [#6249] by [@brunvez]
18
+ * Make sure `ActiveAdmin.routes` provides routes in a consistent order. [#6124] by [@jiikko]
19
+ * Use proper closing tags for HTML in ModalDialog component. [#6221] by [@javierjulio]
20
+
21
+ ### Bug Fixes
22
+
23
+ * Fix comment layout so regardless of size, each is aligned and spaced evenly. [#6393] by [@Ivanov-Anton]
24
+
25
+ ### Translation Improvements
26
+
27
+ * Fix several Arabic translations. [#6368] by [@mshalaby]
28
+ * Add missing `scope/all` italian translation. [#6341] by [@fuzziness]
29
+ * Improve Japanese translation. [#6315] by [@rn0rno]
30
+ * Fix es and es-MX sign_in and sign_up translation. [#6210] by [@roramirez]
31
+
32
+ ### Documentation
33
+
34
+ * Fix filter_columns_for_large_association and filter_method_for_large_association examples. [#6232] by [@ndbroadbent]
35
+
36
+ ### Dependency Changes
37
+
38
+ * Allow formtastic 4. [#6318] by [@deivid-rodriguez]
39
+ * Drop Ruby 2.4 support. [#6198] by [@deivid-rodriguez]
40
+
41
+ ## 2.7.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.6.1..v2.7.0)
42
+
43
+ ### Enhancements
44
+
45
+ * Extend menu to allow for nested submenus. [#5994] by [@taralbass]
46
+ * Add Webpacker compatibility with opt-in config switch and installation generator. [#5855] by [@sgara]
47
+
48
+ ### Bug Fixes
49
+
50
+ * Fix scopes renderer when resource has only optional scopes and their conditions are false. [#6149] by [@Looooong]
51
+ * Fix some missing wrapper markup in "logged out" layout. [#6086] by [@irmela]
52
+ * Fix some typos in Vietnamese translation. [#6099] by [@giapnhdev]
53
+
54
+ ## 2.6.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.6.0..v2.6.1)
55
+
56
+ ### Bug Fixes
57
+
58
+ * Fix some ruby 2.7 warnings about keyword args. [#6000] by [@vcsjones]
59
+ * Missing `create_another` translation in Vietnamese. [#6002] by [@imcvampire]
60
+ * Using "destroy" for user facing message is too robotic, prefer "delete". [#6047] by [@vfonic]
61
+ * Typo in confirmation message for comment deletion. [#6047] by [@vfonic]
62
+
63
+ ## 2.6.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.5.0..v2.6.0)
64
+
65
+ ### Enhancements
66
+
67
+ * Display multiple flash messages in separate elements. [#5929] by [@mirelon]
68
+ * Make delete confirmation messages in French & Spanish gender-neutral. [#5946] by [@cprodhomme]
69
+
70
+ ### Bug Fixes
71
+
72
+ * Export ModalDialog component to re-enable client side usage. [#5956] by [@sgara]
73
+ * Use default ActionView options instead of default Formtastic options for DateRangeInput [#5957] by [@mirelon]
74
+ * Fix i18n key in docs example to translate scopes. [#5943] by [@adler99]
75
+
5
76
  ## 2.5.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.4.0..v2.5.0)
6
77
 
7
78
  ### Enhancements
@@ -13,7 +84,7 @@
13
84
  * Convert namespace to sym to prevent duplicate namespaces such as :foo and 'foo'. [#5931] by [@westonganger]
14
85
  * Use filter label when condition has a predicate. [#5886] by [@ko-lem]
15
86
  * Fix error when routing with array containing symbol. [#5870] by [@jwesorick]
16
- * Fix error when there is a model named `Tag` and `meta_tags` have been configured. [#5893] by [@micred], [@FabioRos] and [@deivid-rodriguez]
87
+ * Fix error when there is a model named `Tag` and `meta_tags` have been configured. [#5895] by [@micred], [@FabioRos] and [@deivid-rodriguez]
17
88
  * Allow specifying custom `input_html` for `DateRangeInput`. [#5867] by [@mirelon]
18
89
  * Adjust `#main_content` right margin to take into account possible custom values of `$sidebar-width` and `$section-padding`. [#5887] by [@guigs]
19
90
  * Improved polymorphic routes generation to avoid problems when multiple `belongs_to` are defined. [#5938] by [@leio10]
@@ -485,15 +556,16 @@ Please check [0-6-stable] for previous changes.
485
556
  [#5504]: https://github.com/activeadmin/activeadmin/pull/5504
486
557
  [#5517]: https://github.com/activeadmin/activeadmin/pull/5517
487
558
  [#5537]: https://github.com/activeadmin/activeadmin/pull/5537
559
+ [#5548]: https://github.com/activeadmin/activeadmin/pull/5548
488
560
  [#5555]: https://github.com/activeadmin/activeadmin/pull/5555
489
561
  [#5583]: https://github.com/activeadmin/activeadmin/pull/5583
562
+ [#5590]: https://github.com/activeadmin/activeadmin/pull/5590
490
563
  [#5608]: https://github.com/activeadmin/activeadmin/pull/5608
491
564
  [#5611]: https://github.com/activeadmin/activeadmin/pull/5611
492
565
  [#5627]: https://github.com/activeadmin/activeadmin/pull/5627
493
566
  [#5631]: https://github.com/activeadmin/activeadmin/pull/5631
494
567
  [#5632]: https://github.com/activeadmin/activeadmin/pull/5632
495
568
  [#5650]: https://github.com/activeadmin/activeadmin/pull/5650
496
- [#5590]: https://github.com/activeadmin/activeadmin/pull/5590
497
569
  [#5662]: https://github.com/activeadmin/activeadmin/pull/5662
498
570
  [#5710]: https://github.com/activeadmin/activeadmin/pull/5710
499
571
  [#5726]: https://github.com/activeadmin/activeadmin/pull/5726
@@ -511,21 +583,49 @@ Please check [0-6-stable] for previous changes.
511
583
  [#5822]: https://github.com/activeadmin/activeadmin/pull/5822
512
584
  [#5826]: https://github.com/activeadmin/activeadmin/pull/5826
513
585
  [#5831]: https://github.com/activeadmin/activeadmin/pull/5831
514
- [#5548]: https://github.com/activeadmin/activeadmin/pull/5548
515
586
  [#5842]: https://github.com/activeadmin/activeadmin/pull/5842
516
587
  [#5854]: https://github.com/activeadmin/activeadmin/pull/5854
588
+ [#5855]: https://github.com/activeadmin/activeadmin/pull/5855
589
+ [#5867]: https://github.com/activeadmin/activeadmin/pull/5867
590
+ [#5870]: https://github.com/activeadmin/activeadmin/pull/5870
517
591
  [#5874]: https://github.com/activeadmin/activeadmin/pull/5874
518
592
  [#5877]: https://github.com/activeadmin/activeadmin/pull/5877
519
593
  [#5886]: https://github.com/activeadmin/activeadmin/pull/5886
520
- [#5870]: https://github.com/activeadmin/activeadmin/pull/5870
521
- [#5893]: https://github.com/activeadmin/activeadmin/pull/5893
522
- [#5867]: https://github.com/activeadmin/activeadmin/pull/5867
523
594
  [#5887]: https://github.com/activeadmin/activeadmin/pull/5887
595
+ [#5894]: https://github.com/activeadmin/activeadmin/pull/5894
596
+ [#5895]: https://github.com/activeadmin/activeadmin/pull/5895
597
+ [#5929]: https://github.com/activeadmin/activeadmin/pull/5929
524
598
  [#5931]: https://github.com/activeadmin/activeadmin/pull/5931
525
599
  [#5938]: https://github.com/activeadmin/activeadmin/pull/5938
600
+ [#5943]: https://github.com/activeadmin/activeadmin/pull/5943
601
+ [#5946]: https://github.com/activeadmin/activeadmin/pull/5946
602
+ [#5956]: https://github.com/activeadmin/activeadmin/pull/5956
603
+ [#5957]: https://github.com/activeadmin/activeadmin/pull/5957
604
+ [#5994]: https://github.com/activeadmin/activeadmin/pull/5994
605
+ [#6000]: https://github.com/activeadmin/activeadmin/pull/6000
606
+ [#6002]: https://github.com/activeadmin/activeadmin/pull/6002
607
+ [#6047]: https://github.com/activeadmin/activeadmin/pull/6047
608
+ [#6086]: https://github.com/activeadmin/activeadmin/pull/6086
609
+ [#6099]: https://github.com/activeadmin/activeadmin/pull/6099
610
+ [#6124]: https://github.com/activeadmin/activeadmin/pull/6124
611
+ [#6149]: https://github.com/activeadmin/activeadmin/pull/6149
612
+ [#6198]: https://github.com/activeadmin/activeadmin/pull/6198
613
+ [#6210]: https://github.com/activeadmin/activeadmin/pull/6210
614
+ [#6221]: https://github.com/activeadmin/activeadmin/pull/6221
615
+ [#6232]: https://github.com/activeadmin/activeadmin/pull/6232
616
+ [#6249]: https://github.com/activeadmin/activeadmin/pull/6249
617
+ [#6315]: https://github.com/activeadmin/activeadmin/pull/6315
618
+ [#6318]: https://github.com/activeadmin/activeadmin/pull/6318
619
+ [#6341]: https://github.com/activeadmin/activeadmin/pull/6341
620
+ [#6368]: https://github.com/activeadmin/activeadmin/pull/6368
621
+ [#6393]: https://github.com/activeadmin/activeadmin/pull/6393
622
+ [#6422]: https://github.com/activeadmin/activeadmin/pull/6422
623
+ [#6451]: https://github.com/activeadmin/activeadmin/pull/6451
624
+ [#6460]: https://github.com/activeadmin/activeadmin/pull/6460
526
625
 
527
626
  [@5t111111]: https://github.com/5t111111
528
627
  [@aarek]: https://github.com/aarek
628
+ [@adler99]: https://github.com/adler99
529
629
  [@ajw725]: https://github.com/ajw725
530
630
  [@alex-bogomolov]: https://github.com/alex-bogomolov
531
631
  [@amiel]: https://github.com/amiel
@@ -534,10 +634,12 @@ Please check [0-6-stable] for previous changes.
534
634
  [@bartoszkopinski]: https://github.com/bartoszkopinski
535
635
  [@blocknotes]: https://github.com/blocknotes
536
636
  [@bolshakov]: https://github.com/bolshakov
637
+ [@brunvez]: https://github.com/brunvez
537
638
  [@buren]: https://github.com/buren
538
639
  [@chancancode]: https://github.com/chancancode
539
640
  [@chrp]: https://github.com/chrp
540
641
  [@chumakoff]: https://github.com/chumakoff
642
+ [@cprodhomme]: https://github.com/cprodhomme
541
643
  [@craigmcnamara]: https://github.com/craigmcnamara
542
644
  [@DanielHeath]: https://github.com/DanielHeath
543
645
  [@deivid-rodriguez]: https://github.com/deivid-rodriguez
@@ -551,17 +653,22 @@ Please check [0-6-stable] for previous changes.
551
653
  [@FabioRos]: https://github.com/FabioRos
552
654
  [@faucct]: https://github.com/faucct
553
655
  [@Fivell]: https://github.com/Fivell
656
+ [@fuzziness]: https://github.com/fuzziness
657
+ [@giapnhdev]: https://github.com/giapnhdev
554
658
  [@glebtv]: https://github.com/glebtv
555
659
  [@gonzedge]: https://github.com/gonzedge
556
660
  [@guigs]: https://github.com/guigs
557
661
  [@HappyKadaver]: https://github.com/HappyKadaver
662
+ [@imcvampire]: https://github.com/imcvampire
558
663
  [@innparusu95]: https://github.com/innparusu95
559
664
  [@ionut998]: https://github.com/ionut998
560
665
  [@irmela]: https://github.com/irmela
666
+ [@Ivanov-Anton]: https://github.com/Ivanov-Anton
561
667
  [@jasl]: https://github.com/jasl
562
668
  [@javierjulio]: https://github.com/javierjulio
563
669
  [@jawa]: https://github.com/jawa
564
670
  [@JiiHu]: https://github.com/JiiHu
671
+ [@jiikko]: https://github.com/jiikko
565
672
  [@johnnyshields]: https://github.com/johnnyshields
566
673
  [@jscheid]: https://github.com/jscheid
567
674
  [@juril33t]: https://github.com/juril33t
@@ -572,11 +679,13 @@ Please check [0-6-stable] for previous changes.
572
679
  [@Kris-LIBIS]: https://github.com/Kris-LIBIS
573
680
  [@kwent]: https://github.com/kwent
574
681
  [@leio10]: https://github.com/leio10
682
+ [@Looooong]: https://github.com/Looooong
575
683
  [@markstory]: https://github.com/markstory
576
684
  [@mauriciopasquier]: https://github.com/mauriciopasquier
577
685
  [@mconiglio]: https://github.com/mconiglio
578
686
  [@micred]: https://github.com/micred
579
687
  [@mirelon]: https://github.com/mirelon
688
+ [@mshalaby]: https://github.com/mshalaby
580
689
  [@ndbroadbent]: https://github.com/ndbroadbent
581
690
  [@Nguyenanh]: https://github.com/Nguyenanh
582
691
  [@orkhan]: https://github.com/orkhan
@@ -585,8 +694,10 @@ Please check [0-6-stable] for previous changes.
585
694
  [@potatosalad]: https://github.com/potatosalad
586
695
  [@pranas]: https://github.com/pranas
587
696
  [@renotocn]: https://github.com/renotocn
697
+ [@rn0rno]: https://github.com/rn0rno
588
698
  [@RobinvanderVliet]: https://github.com/RobinvanderVliet
589
699
  [@rogerkk]: https://github.com/rogerkk
700
+ [@roramirez]: https://github.com/roramirez
590
701
  [@seanlinsley]: https://github.com/seanlinsley
591
702
  [@sgara]: https://github.com/sgara
592
703
  [@ShallmentMo]: https://github.com/ShallmentMo
@@ -594,10 +705,13 @@ Please check [0-6-stable] for previous changes.
594
705
  [@shouya]: https://github.com/shouya
595
706
  [@stefsava]: https://github.com/stefsava
596
707
  [@stereoscott]: https://github.com/stereoscott
708
+ [@taralbass]: https://github.com/taralbass
597
709
  [@tiagotex]: https://github.com/tiagotex
598
710
  [@timoschilling]: https://github.com/timoschilling
599
711
  [@TimPetricola]: https://github.com/TimPetricola
600
712
  [@varyonic]: https://github.com/varyonic
713
+ [@vcsjones]: https://github.com/vcsjones
714
+ [@vfonic]: https://github.com/vfonic
601
715
  [@violeta-p]: https://github.com/violeta-p
602
716
  [@WaKeMaTTa]: https://github.com/WaKeMaTTa
603
717
  [@wasifhossain]: https://github.com/wasifhossain
@@ -5,10 +5,12 @@ like you that make Active Admin such a great tool.
5
5
 
6
6
  ### Where do I go from here?
7
7
 
8
- If you've noticed a bug or have a question that doesn't belong on the [mailing
9
- list] or [Stack Overflow], [search the issue tracker] to see if someone else in
10
- the community has already created a ticket. If not, go ahead and [make one][new
11
- issue]!
8
+ If you've noticed a bug or have a feature request, [make one][new issue]! It's
9
+ generally best if you get confirmation of your bug or approval for your feature
10
+ request this way before starting to code.
11
+
12
+ If you have a general question about activeadmin, you can post it on [Stack
13
+ Overflow], the issue tracker is only for bugs and feature requests.
12
14
 
13
15
  ### Fork & create a branch
14
16
 
@@ -67,22 +69,6 @@ export BUNDLE_GEMFILE=gemfiles/rails_60/Gemfile
67
69
  **Warning** SCSS assets are aimed to be used indifferently with Sprockets **and** webpacker.
68
70
  As such, make sure not to use any sass-rails directives such as `asset-url` or `image-url`.
69
71
 
70
- ### Did you find a bug?
71
-
72
- * **Ensure the bug was not already reported** by [searching all issues].
73
-
74
- * If you're unable to find an open issue addressing the problem,
75
- [open a new one][new issue]. Be sure to include a **title and clear
76
- description**, as much relevant information as possible, and a **code sample**
77
- or an **executable test case** demonstrating the expected behavior that is not
78
- occurring.
79
-
80
- * If possible, use the relevant bug report templates to create the issue.
81
- Simply copy the content of the appropriate template into a .rb file, make the
82
- necessary changes to demonstrate the issue, and **paste the content into the
83
- issue description**:
84
- * [**ActiveAdmin** master issues][master template]
85
-
86
72
  ### Implement your fix or feature
87
73
 
88
74
  At this point, you're ready to make your changes! Feel free to ask for help;
@@ -129,22 +115,6 @@ checks as the rest of the project. `bin/rake lint` will give you feedback in
129
115
  this regard. You can check & fix style issues by running each linter
130
116
  individually. Run `bin/rake -T lint` to see the available linters.
131
117
 
132
- ### Add a changelog entry
133
-
134
- If your PR includes user-observable changes, you'll be asked to add a changelog
135
- entry following the existing changelog format.
136
-
137
- The changelog format is the following:
138
-
139
- * One line per PR describing your fix or enhancement.
140
- * Entries end with a dot, followed by "[#pr-number] by [@github-username]".
141
- * Entries are added under the "Unreleased" section at the top of the file, under
142
- the "Bug Fixes" or "Enhancements" subsection.
143
- * References to github usernames and pull requests use [shortcut reference
144
- links].
145
- * Your github username reference definition is included in the correct
146
- alphabetical position at the bottom of the file.
147
-
148
118
  ### Make a Pull Request
149
119
 
150
120
  At this point, you should switch back to your master branch and make sure it's
@@ -204,37 +174,21 @@ met.
204
174
 
205
175
  Maintainers need to do the following to push out a release:
206
176
 
207
- * Make sure all pull requests are in and that changelog is current
208
- * Update `version.rb` file and changelog with new version number
209
- * If it's not a patch level release, create a stable branch for that release,
210
- otherwise switch to the stable branch corresponding to the patch release you
211
- want to ship:
212
-
213
- ```sh
214
- git checkout master
215
- git fetch activeadmin
216
- git rebase activeadmin/master
217
- # If the release is 2.1.x then this should be: 2-1-stable
218
- git checkout -b N-N-stable
219
- git push activeadmin N-N-stable:N-N-stable
220
- ```
221
-
177
+ * Switch to the master branch and make sure it's up to date.
222
178
  * Make sure you have [chandler] properly configured. Chandler is used to
223
179
  automatically submit github release notes from the changelog right after
224
180
  pushing the gem to rubygems.
225
- * `bin/rake release`
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.
183
+ * Run `bin/rake release` from the target branch once the PR is merged.
226
184
 
227
185
  [chandler]: https://github.com/mattbrictson/chandler#2-configure-credentials
228
- [mailing list]: http://groups.google.com/group/activeadmin
229
186
  [Stack Overflow]: http://stackoverflow.com/questions/tagged/activeadmin
230
- [search the issue tracker]: https://github.com/activeadmin/activeadmin/issues?q=something
231
187
  [new issue]: https://github.com/activeadmin/activeadmin/issues/new
232
188
  [fork Active Admin]: https://help.github.com/articles/fork-a-repo
233
- [searching all issues]: https://github.com/activeadmin/activeadmin/issues?q=
234
- [master template]: https://github.com/activeadmin/activeadmin/blob/master/tasks/bug_report_template.rb
235
189
  [make a pull request]: https://help.github.com/articles/creating-a-pull-request
236
190
  [git rebasing]: http://git-scm.com/book/en/Git-Branching-Rebasing
237
- [interactive rebase]: https://help.github.com/articles/interactive-rebase
191
+ [interactive rebase]: https://help.github.com/en/github/using-git/about-git-rebase
238
192
  [shortcut reference links]: https://github.github.com/gfm/#shortcut-reference-link
239
193
  [Rollup]: https://rollupjs.org/guide/en/#quick-start
240
194
  [Yarn]: https://yarnpkg.com/en/docs/install
data/README.md CHANGED
@@ -93,7 +93,7 @@ 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
96
+ [circle_badge]: https://circleci.com/gh/activeadmin/activeadmin/tree/master.svg?style=svg
97
97
  [circle]: https://circleci.com/gh/activeadmin/activeadmin/tree/master
98
98
  [coverage_badge]: https://api.codeclimate.com/v1/badges/779e407d22bacff19733/test_coverage
99
99
  [coverage]: https://codeclimate.com/github/activeadmin/activeadmin/test_coverage
@@ -101,7 +101,7 @@ Thanks to [Open Collective][opencollective contributors] and all our Open Collec
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
@@ -10,9 +10,10 @@
10
10
  //= require jquery_ujs
11
11
  //= require_self
12
12
 
13
- (function(factory) {
14
- 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();
15
- })(function() {
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 = typeof globalThis !== "undefined" ? globalThis : global || self,
15
+ factory(global.ActiveAdmin = {}));
16
+ })(this, function(exports) {
16
17
  "use strict";
17
18
  $.fn.serializeObject = function() {
18
19
  return this.serializeArray().reduce(function(obj, item) {
@@ -26,18 +27,17 @@
26
27
  function ModalDialog(message, inputs, callback) {
27
28
  var html = '<form id="dialog_confirm" title="' + message + '"><ul>';
28
29
  for (var name in inputs) {
29
- var elem, opts, wrapper;
30
+ var opts, wrapper;
30
31
  var type = inputs[name];
31
32
  if (/^(datepicker|checkbox|text|number)$/.test(type)) {
32
33
  wrapper = "input";
33
34
  } else if (type === "textarea") {
34
35
  wrapper = "textarea";
35
36
  } else if ($.isArray(type)) {
36
- var _ref = [ "select", "option", type, "" ];
37
+ var _ref = [ "select", type, "" ];
37
38
  wrapper = _ref[0];
38
- elem = _ref[1];
39
- opts = _ref[2];
40
- type = _ref[3];
39
+ opts = _ref[1];
40
+ type = _ref[2];
41
41
  } else {
42
42
  throw new Error("Unsupported input type: {" + name + ": " + type + "}");
43
43
  }
@@ -45,29 +45,28 @@
45
45
  html += "<li>\n <label>" + (name.charAt(0).toUpperCase() + name.slice(1)) + "</label>\n <" + wrapper + ' name="' + name + '" class="' + klass + '" type="' + type + '">' + (opts ? function() {
46
46
  var result = [];
47
47
  opts.forEach(function(v) {
48
- var $elem = $("<" + elem + "/>");
48
+ var $elem = $("<option></option>");
49
49
  if ($.isArray(v)) {
50
50
  $elem.text(v[0]).val(v[1]);
51
51
  } else {
52
52
  $elem.text(v);
53
53
  }
54
- result.push($elem.wrap("<div>").parent().html());
54
+ result.push($elem.wrap("<div></div>").parent().html());
55
55
  });
56
56
  return result;
57
57
  }().join("") : "") + ("</" + wrapper + ">") + "</li>";
58
58
  var _ref2 = [];
59
59
  wrapper = _ref2[0];
60
- elem = _ref2[1];
61
- opts = _ref2[2];
62
- type = _ref2[3];
63
- klass = _ref2[4];
60
+ opts = _ref2[1];
61
+ type = _ref2[2];
62
+ klass = _ref2[3];
64
63
  }
65
64
  html += "</ul></form>";
66
65
  var form = $(html).appendTo("body");
67
66
  $("body").trigger("modal_dialog:before_open", [ form ]);
68
67
  form.dialog({
69
68
  modal: true,
70
- open: function open(event, ui) {
69
+ open: function open(_event, _ui) {
71
70
  $("body").trigger("modal_dialog:after_open", [ form ]);
72
71
  },
73
72
  dialogClass: "active_admin_dialog",
@@ -135,7 +134,7 @@
135
134
  this._bind();
136
135
  }
137
136
  var _proto = CheckboxToggler.prototype;
138
- _proto.option = function option(key, value) {};
137
+ _proto.option = function option(_key, _value) {};
139
138
  _proto._init = function _init() {
140
139
  if (!this.container) {
141
140
  throw new Error("Container element not found");
@@ -158,7 +157,7 @@
158
157
  return _this._didChangeToggleAllCheckbox();
159
158
  });
160
159
  };
161
- _proto._didChangeCheckbox = function _didChangeCheckbox(checkbox) {
160
+ _proto._didChangeCheckbox = function _didChangeCheckbox(_checkbox) {
162
161
  var numChecked = this.checkboxes.filter(":checked").length;
163
162
  var allChecked = numChecked === this.checkboxes.length;
164
163
  var someChecked = numChecked > 0 && numChecked < this.checkboxes.length;
@@ -463,7 +462,7 @@
463
462
  return PerPage;
464
463
  }();
465
464
  (function($) {
466
- $(document).on("change", ".pagination_per_page > select", function(event) {
465
+ $(document).on("change", ".pagination_per_page > select", function(_event) {
467
466
  PerPage._jQueryInterface.call($(this), "update");
468
467
  });
469
468
  $.fn["perPage"] = PerPage._jQueryInterface;
@@ -506,4 +505,13 @@
506
505
  return $("#active_admin_content .tabs").tabs();
507
506
  };
508
507
  $(document).ready(onDOMReady$2).on("page:load turbolinks:load", onDOMReady$2);
508
+ function modal_dialog(message, inputs, callback) {
509
+ console.warn("ActiveAdmin.modal_dialog is deprecated in favor of ActiveAdmin.ModalDialog, please update usage.");
510
+ return ModalDialog(message, inputs, callback);
511
+ }
512
+ exports.ModalDialog = ModalDialog;
513
+ exports.modal_dialog = modal_dialog;
514
+ Object.defineProperty(exports, "__esModule", {
515
+ value: true
516
+ });
509
517
  });