activeadmin 2.1.0 → 2.5.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 (138) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +112 -27
  3. data/CONTRIBUTING.md +50 -26
  4. data/README.md +8 -1
  5. data/app/assets/javascripts/active_admin/base.js +509 -0
  6. data/app/assets/stylesheets/active_admin/_base.scss +29 -29
  7. data/app/assets/stylesheets/active_admin/_header.scss +3 -5
  8. data/app/assets/stylesheets/active_admin/_mixins.scss +1 -1
  9. data/{vendor → app}/assets/stylesheets/active_admin/_normalize.scss +0 -0
  10. data/app/assets/stylesheets/active_admin/components/_tables.scss +1 -2
  11. data/app/assets/stylesheets/active_admin/mixins/_all.scss +8 -8
  12. data/app/assets/stylesheets/active_admin/mixins/_variables.scss +5 -0
  13. data/app/assets/stylesheets/active_admin/print.scss +2 -2
  14. data/app/assets/stylesheets/active_admin/structure/_main_structure.scss +1 -1
  15. data/app/javascript/active_admin/base.js +19 -0
  16. data/app/{assets/javascripts/active_admin/ext/jquery-ui.es6 → javascript/active_admin/ext/jquery-ui.js} +0 -0
  17. data/app/{assets/javascripts/active_admin/ext/jquery.es6 → javascript/active_admin/ext/jquery.js} +0 -0
  18. data/app/{assets/javascripts/active_admin/lib/batch_actions.es6 → javascript/active_admin/initializers/batch-actions.js} +9 -3
  19. data/app/javascript/active_admin/initializers/checkbox-toggler.js +3 -0
  20. data/app/{assets/javascripts/active_admin/initializers/datepicker.es6 → javascript/active_admin/initializers/datepicker.js} +0 -0
  21. data/app/javascript/active_admin/initializers/dropdown-menu.js +9 -0
  22. data/app/javascript/active_admin/initializers/filters.js +10 -0
  23. data/app/{assets/javascripts/active_admin/lib/has_many.es6 → javascript/active_admin/initializers/has-many.js} +0 -0
  24. data/app/javascript/active_admin/initializers/per-page.js +13 -0
  25. data/app/javascript/active_admin/initializers/table-checkbox-toggler.js +3 -0
  26. data/app/{assets/javascripts/active_admin/initializers/tabs.es6 → javascript/active_admin/initializers/tabs.js} +0 -0
  27. data/app/{assets/javascripts/active_admin/lib/checkbox-toggler.es6 → javascript/active_admin/lib/checkbox-toggler.js} +2 -2
  28. data/app/{assets/javascripts/active_admin/lib/dropdown-menu.es6 → javascript/active_admin/lib/dropdown-menu.js} +2 -9
  29. data/app/javascript/active_admin/lib/filters.js +39 -0
  30. data/app/{assets/javascripts/active_admin/lib/modal_dialog.es6 → javascript/active_admin/lib/modal-dialog.js} +3 -1
  31. data/app/javascript/active_admin/lib/per-page.js +38 -0
  32. data/app/{assets/javascripts/active_admin/lib/table-checkbox-toggler.es6 → javascript/active_admin/lib/table-checkbox-toggler.js} +4 -2
  33. data/app/javascript/active_admin/lib/utils.js +40 -0
  34. data/app/views/kaminari/active_admin_countless/_first_page.html.erb +11 -0
  35. data/app/views/kaminari/active_admin_countless/_gap.html.erb +8 -0
  36. data/app/views/kaminari/active_admin_countless/_next_page.html.erb +11 -0
  37. data/app/views/kaminari/active_admin_countless/_page.html.erb +12 -0
  38. data/app/views/kaminari/active_admin_countless/_paginator.html.erb +24 -0
  39. data/app/views/kaminari/active_admin_countless/_prev_page.html.erb +11 -0
  40. data/config/locales/ar.yml +3 -2
  41. data/config/locales/az.yml +138 -0
  42. data/config/locales/bg.yml +1 -0
  43. data/config/locales/bs.yml +1 -0
  44. data/config/locales/ca.yml +1 -1
  45. data/config/locales/cs.yml +1 -0
  46. data/config/locales/da.yml +1 -0
  47. data/config/locales/de-CH.yml +1 -0
  48. data/config/locales/de.yml +19 -0
  49. data/config/locales/el.yml +1 -0
  50. data/config/locales/en-CA.yml +1 -0
  51. data/config/locales/en-GB.yml +1 -0
  52. data/config/locales/en.yml +1 -0
  53. data/config/locales/eo.yml +1 -0
  54. data/config/locales/es-MX.yml +1 -0
  55. data/config/locales/es.yml +1 -0
  56. data/config/locales/fa.yml +1 -0
  57. data/config/locales/fi.yml +1 -0
  58. data/config/locales/fr.yml +2 -1
  59. data/config/locales/he.yml +1 -0
  60. data/config/locales/hr.yml +1 -0
  61. data/config/locales/hu.yml +1 -0
  62. data/config/locales/id.yml +1 -0
  63. data/config/locales/it.yml +1 -0
  64. data/config/locales/ja.yml +1 -0
  65. data/config/locales/ko.yml +1 -0
  66. data/config/locales/lt.yml +1 -0
  67. data/config/locales/lv.yml +1 -0
  68. data/config/locales/mk.yml +134 -0
  69. data/config/locales/nb.yml +1 -0
  70. data/config/locales/nl.yml +1 -0
  71. data/config/locales/pl.yml +1 -0
  72. data/config/locales/pt-BR.yml +1 -0
  73. data/config/locales/pt-PT.yml +1 -0
  74. data/config/locales/ro.yml +1 -0
  75. data/config/locales/ru.yml +1 -0
  76. data/config/locales/sk.yml +60 -0
  77. data/config/locales/sv-SE.yml +1 -0
  78. data/config/locales/tr.yml +1 -0
  79. data/config/locales/uk.yml +1 -0
  80. data/config/locales/vi.yml +1 -0
  81. data/config/locales/zh-CN.yml +1 -0
  82. data/config/locales/zh-TW.yml +1 -0
  83. data/docs/1-general-configuration.md +20 -0
  84. data/docs/12-arbre-components.md +13 -0
  85. data/docs/13-authorization-adapter.md +2 -2
  86. data/docs/2-resource-customization.md +1 -1
  87. data/docs/3-index-pages/index-as-table.md +7 -0
  88. data/docs/Gemfile +0 -1
  89. data/docs/Gemfile.lock +58 -58
  90. data/docs/_config.yml +2 -0
  91. data/docs/_includes/top-menu.html +2 -2
  92. data/docs/index.html +108 -7
  93. data/docs/stylesheets/main.css +29 -0
  94. data/lib/active_admin.rb +0 -1
  95. data/lib/active_admin/application.rb +12 -3
  96. data/lib/active_admin/batch_actions/resource_extension.rb +5 -1
  97. data/lib/active_admin/controller_action.rb +2 -1
  98. data/lib/active_admin/csv_builder.rb +3 -2
  99. data/lib/active_admin/dependency.rb +0 -4
  100. data/lib/active_admin/error.rb +3 -1
  101. data/lib/active_admin/filters/active_filter.rb +3 -4
  102. data/lib/active_admin/filters/resource_extension.rb +24 -0
  103. data/lib/active_admin/generators/boilerplate.rb +12 -4
  104. data/lib/active_admin/inputs/filters/date_range_input.rb +4 -4
  105. data/lib/active_admin/namespace_settings.rb +13 -0
  106. data/lib/active_admin/order_clause.rb +1 -1
  107. data/lib/active_admin/page_presenter.rb +2 -1
  108. data/lib/active_admin/pundit_adapter.rb +7 -3
  109. data/lib/active_admin/resource.rb +16 -2
  110. data/lib/active_admin/resource/belongs_to.rb +6 -1
  111. data/lib/active_admin/resource/model.rb +15 -0
  112. data/lib/active_admin/resource/routes.rb +11 -3
  113. data/lib/active_admin/resource_controller.rb +2 -0
  114. data/lib/active_admin/resource_controller/decorators.rb +2 -2
  115. data/lib/active_admin/resource_controller/polymorphic_routes.rb +37 -0
  116. data/lib/active_admin/router.rb +2 -1
  117. data/lib/active_admin/scope.rb +7 -3
  118. data/lib/active_admin/sidebar_section.rb +3 -1
  119. data/lib/active_admin/version.rb +1 -1
  120. data/lib/active_admin/view_helpers/breadcrumb_helper.rb +2 -2
  121. data/lib/active_admin/view_helpers/display_helper.rb +3 -2
  122. data/lib/active_admin/views/components/paginated_collection.rb +3 -2
  123. data/lib/active_admin/views/components/status_tag.rb +5 -1
  124. data/lib/active_admin/views/components/table_for.rb +1 -0
  125. data/lib/active_admin/views/index_as_table.rb +7 -0
  126. data/lib/active_admin/views/pages/base.rb +1 -1
  127. data/lib/active_admin/views/pages/index.rb +1 -0
  128. data/lib/generators/active_admin/install/templates/active_admin.rb.erb +14 -1
  129. data/lib/generators/active_admin/resource/templates/admin.rb.erb +40 -37
  130. data/lib/ransack_ext.rb +2 -2
  131. metadata +38 -45
  132. data/app/assets/images/active_admin/nested_menu_arrow.gif +0 -0
  133. data/app/assets/images/active_admin/nested_menu_arrow_dark.gif +0 -0
  134. data/app/assets/images/active_admin/orderable.png +0 -0
  135. data/app/assets/javascripts/active_admin/base.es6 +0 -23
  136. data/app/assets/javascripts/active_admin/initializers/filters.es6 +0 -45
  137. data/app/assets/javascripts/active_admin/lib/active_admin.es6 +0 -41
  138. data/app/assets/javascripts/active_admin/lib/per_page.es6 +0 -47
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 27d6666a21998778549c84482d06084a12eba6df461f4183215d34a47188fc09
4
- data.tar.gz: d1986d700254bf17ff146e04e3a4ded4a76685fb3a1f9eb3abfde12252c4551e
3
+ metadata.gz: 7d4b2286091c361bd4e0e7b408ed7e4f6bf3aa118492ed037cb51b2f6e882cf4
4
+ data.tar.gz: b9381cb429a6ccfda90d0a51f646c759843c387bda107dcb3d66cffa26cd083f
5
5
  SHA512:
6
- metadata.gz: eaefb8c2b8866055feb7bab79b6be4708f3b8fcf678aee9c38e7df868b97c0e8d14dcbcadc7b400a8fbb9ab866e49a6524972dc02f017e86ec4122407b90e311
7
- data.tar.gz: 50f15d8ef7589802b84538579299d973d6822c8b4052a948a4b237859c1fa7f70ddbb9703c257ccdba910c73efefc775804d55e1ee3256cf9f6685fd1ed26333
6
+ metadata.gz: 8dba7ffe9ed0516ebfc0f484d548962d677d9d6a36cbf097c0e76e06db7ef87c0469791fdb7917ddd2b831927225958107a16aab3cd096f1ffbf8bc49ebf697d
7
+ data.tar.gz: d9dd9f7295fe4f0ccc852ab375637578c86621bd30435d62f2c7d7754ccb5693910aa39e0a154fdbd5535613b3f829ef31a8520761162006e12755e85db9dabb
@@ -2,7 +2,68 @@
2
2
 
3
3
  ## Unreleased
4
4
 
5
- ## 2.1.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.1.0..v2.0.0)
5
+ ## 2.5.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.4.0..v2.5.0)
6
+
7
+ ### Enhancements
8
+
9
+ * Azerbaijani translation. [#5078] by [@orkhan]
10
+
11
+ ### Bug Fixes
12
+
13
+ * Convert namespace to sym to prevent duplicate namespaces such as :foo and 'foo'. [#5931] by [@westonganger]
14
+ * Use filter label when condition has a predicate. [#5886] by [@ko-lem]
15
+ * 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]
17
+ * Allow specifying custom `input_html` for `DateRangeInput`. [#5867] by [@mirelon]
18
+ * Adjust `#main_content` right margin to take into account possible custom values of `$sidebar-width` and `$section-padding`. [#5887] by [@guigs]
19
+ * Improved polymorphic routes generation to avoid problems when multiple `belongs_to` are defined. [#5938] by [@leio10]
20
+
21
+ ### Dependency Changes
22
+
23
+ * Support for Rails 5.0 and Rails 5.1 has been dropped. [#5877] by [@deivid-rodriguez]
24
+
25
+ ## 2.4.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.3.1..v2.4.0)
26
+
27
+ ### Enhancements
28
+
29
+ * Make optimization to not use expensive COUNT queries also work for decorated actions. [#5811] by [@irmela]
30
+ * Render a text filter instead of a select for large associations (opt-in). [#5548] by [@DanielHeath]
31
+ * Improve German translations. [#5874] by [@juril33t]
32
+
33
+ ## 2.3.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.3.0..v2.3.1)
34
+
35
+ ### Bug Fixes
36
+
37
+ * Revert ransack version pinning because 2.3 has an outstanding bug that affects quite a lot of users. See [this ransack issue](https://github.com/activerecord-hackery/ransack/issues/1039) for more information. [#5854] by [@deivid-rodriguez]
38
+
39
+ ## 2.3.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.2.0..v2.3.0)
40
+
41
+ ### Enhancements
42
+
43
+ * Bump minimum ransack requirement to make sure everyone gets a version that works ok with all supported versions of Rails. [#5831] by [@deivid-rodriguez]
44
+
45
+ ### Bug Fixes
46
+
47
+ * Fix CSVBuilder not respecting `ActiveAdmin.application.csv_options = { humanize_name: false }` setting. [#5800] by [@HappyKadaver]
48
+ * Fix crash when displaying current filters after filtering by a nested resource. [#5816] by [@deivid-rodriguez]
49
+ * Fix pagination when `pagination_total` is false to not show a "Last" link, since it's incorrect because we don't have the total pages information. [#5822] by [@deivid-rodriguez]
50
+ * Fix optional nested resources causing incorrect routes to be generated, when renamed resources (through `:as` option) are involved. [#5826] by [@ndbroadbent], [@Kris-LIBIS] and [@deivid-rodriguez]
51
+ * Fix double modal issue in applications using turbolinks 5. [#5842] by [@sgara]
52
+
53
+ ## 2.2.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.1.0..v2.2.0)
54
+
55
+ ### Enhancements
56
+
57
+ * The `status_tag` component now supports different labels for `false` and `nil` boolean cases through the locale. Both default to display "No" for backwards compatibility. [#5794] by [@javierjulio]
58
+ * Add Macedonian locale. [#5710] by [@violeta-p]
59
+
60
+ ### Bug Fixes
61
+
62
+ * Fix pundit policy retrieving for static pages when the pundit namespace is `:active_admin`. [#5777] by [@kwent]
63
+ * Fix show page title not being properly escaped if title's content included HTML. [#5802] by [@deivid-rodriguez]
64
+ * Revert [21b6138f] from [#5740] since it actually caused the performance in development to regress. [#5801] by [@deivid-rodriguez]
65
+
66
+ ## 2.1.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.0.0..v2.1.0)
6
67
 
7
68
  ### Bug Fixes
8
69
 
@@ -10,7 +71,7 @@
10
71
  * Crash when rendering comments from a custom controller block. [#5758] by [@deivid-rodriguez]
11
72
  * Switch `sass` dependency to `sassc-rails`, since `sass` is no longer supported and since it restores support for directly importing `css` files. [#5504] by [@deivid-rodriguez]
12
73
 
13
- ### Removals
74
+ ### Dependency Changes
14
75
 
15
76
  * Support for ruby 2.3 has been removed. [#5751] by [@deivid-rodriguez]
16
77
 
@@ -22,8 +83,6 @@ _No changes_.
22
83
 
23
84
  ### Enhancements
24
85
 
25
- #### Minor
26
-
27
86
  * Require arbre `~> 1.2, >= 1.2.1`. [#5726] by [@ionut998], and [#5738] by [@deivid-rodriguez]
28
87
 
29
88
  ## 2.0.0.rc1 [☰](https://github.com/activeadmin/activeadmin/compare/v1.4.3..v2.0.0.rc1)
@@ -39,9 +98,6 @@ _No changes_.
39
98
  ```
40
99
 
41
100
  * Consider authorization when displaying comments in show page. [#5555] by [@amiuhle]
42
-
43
- #### Minor
44
-
45
101
  * Add better support for rendering lists. [#5370] by [@dkniffin]
46
102
  * Undeprecate `config.register_stylesheet` and `config.register_javascript` for lack of better solution for including external assets. It might be reevaluated in the future. [#5662] by [@deivid-rodriguez]
47
103
 
@@ -58,7 +114,7 @@ _No changes_.
58
114
  * Sidebar title internationalization. [#5417] by [@WaKeMaTTa]
59
115
  * `filter` labels not allowing a `Proc` to be passed. [#5418] by [@WaKeMaTTa]
60
116
 
61
- ### Removals
117
+ ### Dependency Changes
62
118
 
63
119
  * Rails 4.2 support has been dropped. [#5104] by [@javierjulio] and [@deivid-rodriguez]
64
120
  * Dependency on coffee-rails has been removed. [#5081] by [@javierjulio]
@@ -94,8 +150,6 @@ _No changes_.
94
150
 
95
151
  ### Enhancements
96
152
 
97
- #### Minor
98
-
99
153
  * Add missing I18n for comments. [#5458], [#5461] by [@mauriciopasquier]
100
154
  * Fix batch_actions.delete_confirmation translation in zh-CN.yml. [#5453] by [@ShallmentMo]
101
155
  * Add some missing italian translations. [#5433] by [@stefsava]
@@ -133,8 +187,6 @@ _No changes_.
133
187
 
134
188
  ### Enhancements
135
189
 
136
- #### Major
137
-
138
190
  * Rails 5.2 support [#5343] by [@varyonic], [#5399], [#5401] by [@zorab47]
139
191
 
140
192
  ## 1.2.1 [☰](https://github.com/activeadmin/activeadmin/compare/v1.2.0..v1.2.1)
@@ -147,8 +199,6 @@ _No changes_.
147
199
 
148
200
  ### Enhancements
149
201
 
150
- #### Minor
151
-
152
202
  * Do not display pagination info when there are no comments. [#5119] by [@alex-bogomolov]
153
203
  * Revert generated config files to pluralized. [#5120] by [@varyonic], [#5137] by [@deivid-rodriguez]
154
204
  * Warn when action definition overwrites controller method. [#5167] by [@aarek]
@@ -179,7 +229,7 @@ _No changes_.
179
229
  * Fixed [#5043]. Do not crash in sidebar rendering when a default scope is not specified. [#5044] by [@Fivell]
180
230
  * Fixed [#3894]. Make tab's component work with non-ascii titles. [#5046] by [@Fivell]
181
231
 
182
- ### Removals
232
+ ### Dependency Changes
183
233
 
184
234
  * Ruby 2.1 support has been dropped. [#5003] by [@deivid-rodriguez]
185
235
  * Replaced `sass-rails` with `sass` dependency. [#5037] by [@javierjulio]
@@ -217,8 +267,6 @@ _No changes_.
217
267
 
218
268
  ### Enhancements
219
269
 
220
- #### Minor
221
-
222
270
  * Support proc as an input_html option value when declaring filters. [#5029] by [@Fivell]
223
271
  * Base localization support, better associations handling for active filters sidebar. [#4951] by [@Fivell]
224
272
  * Allow AA scopes to return paginated collections. [#4996] by [@Fivell]
@@ -242,16 +290,11 @@ _No changes_.
242
290
 
243
291
  ### Enhancements
244
292
 
245
- #### Major
246
-
247
293
  * Migration from Metasearch to Ransack. [#1979] by [@seanlinsley]
248
294
  * Rails 4 support. [#2326] by many people :heart:
249
295
  * Rails 4.2 support. [#3731] by [@gonzedge] and [@timoschilling]
250
296
  * Rails 5 support. [#4254] by [@seanlinsley]
251
297
  * Rails 5.1 support. [#4882] by [@varyonic]
252
-
253
- #### Minor
254
-
255
298
  * "Create another" checkbox for the new resource page. [#4477] by [@bolshakov]
256
299
  * Page supports belongs_to. [#4759] by [@Fivell] and [@zorab47]
257
300
  * Support for custom sorting strategies. [#4768] by [@Fivell]
@@ -355,6 +398,8 @@ Please check [0-6-stable] for previous changes.
355
398
  [#5043]: https://github.com/activeadmin/activeadmin/issues/5043
356
399
  [#5198]: https://github.com/activeadmin/activeadmin/issues/5198
357
400
 
401
+ [21b6138f]: https://github.com/activeadmin/activeadmin/pull/5740/commits/21b6138fdcf58cd54c3f1d3f60cb1127b174b40f
402
+
358
403
  [#3091]: https://github.com/activeadmin/activeadmin/pull/3091
359
404
  [#3435]: https://github.com/activeadmin/activeadmin/pull/3435
360
405
  [#4477]: https://github.com/activeadmin/activeadmin/pull/4477
@@ -380,6 +425,7 @@ Please check [0-6-stable] for previous changes.
380
425
  [#5052]: https://github.com/activeadmin/activeadmin/pull/5052
381
426
  [#5060]: https://github.com/activeadmin/activeadmin/pull/5060
382
427
  [#5069]: https://github.com/activeadmin/activeadmin/pull/5069
428
+ [#5078]: https://github.com/activeadmin/activeadmin/pull/5078
383
429
  [#5081]: https://github.com/activeadmin/activeadmin/pull/5081
384
430
  [#5088]: https://github.com/activeadmin/activeadmin/pull/5088
385
431
  [#5093]: https://github.com/activeadmin/activeadmin/pull/5093
@@ -449,11 +495,34 @@ Please check [0-6-stable] for previous changes.
449
495
  [#5650]: https://github.com/activeadmin/activeadmin/pull/5650
450
496
  [#5590]: https://github.com/activeadmin/activeadmin/pull/5590
451
497
  [#5662]: https://github.com/activeadmin/activeadmin/pull/5662
498
+ [#5710]: https://github.com/activeadmin/activeadmin/pull/5710
452
499
  [#5726]: https://github.com/activeadmin/activeadmin/pull/5726
453
500
  [#5738]: https://github.com/activeadmin/activeadmin/pull/5738
454
501
  [#5740]: https://github.com/activeadmin/activeadmin/pull/5740
455
502
  [#5751]: https://github.com/activeadmin/activeadmin/pull/5751
456
503
  [#5758]: https://github.com/activeadmin/activeadmin/pull/5758
504
+ [#5777]: https://github.com/activeadmin/activeadmin/pull/5777
505
+ [#5794]: https://github.com/activeadmin/activeadmin/pull/5794
506
+ [#5800]: https://github.com/activeadmin/activeadmin/pull/5800
507
+ [#5801]: https://github.com/activeadmin/activeadmin/pull/5801
508
+ [#5802]: https://github.com/activeadmin/activeadmin/pull/5802
509
+ [#5811]: https://github.com/activeadmin/activeadmin/pull/5811
510
+ [#5816]: https://github.com/activeadmin/activeadmin/pull/5816
511
+ [#5822]: https://github.com/activeadmin/activeadmin/pull/5822
512
+ [#5826]: https://github.com/activeadmin/activeadmin/pull/5826
513
+ [#5831]: https://github.com/activeadmin/activeadmin/pull/5831
514
+ [#5548]: https://github.com/activeadmin/activeadmin/pull/5548
515
+ [#5842]: https://github.com/activeadmin/activeadmin/pull/5842
516
+ [#5854]: https://github.com/activeadmin/activeadmin/pull/5854
517
+ [#5874]: https://github.com/activeadmin/activeadmin/pull/5874
518
+ [#5877]: https://github.com/activeadmin/activeadmin/pull/5877
519
+ [#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
+ [#5887]: https://github.com/activeadmin/activeadmin/pull/5887
524
+ [#5931]: https://github.com/activeadmin/activeadmin/pull/5931
525
+ [#5938]: https://github.com/activeadmin/activeadmin/pull/5938
457
526
 
458
527
  [@5t111111]: https://github.com/5t111111
459
528
  [@aarek]: https://github.com/aarek
@@ -462,10 +531,12 @@ Please check [0-6-stable] for previous changes.
462
531
  [@amiel]: https://github.com/amiel
463
532
  [@amiuhle]: https://github.com/amiuhle
464
533
  [@andreslemik]: https://github.com/andreslemik
534
+ [@bartoszkopinski]: https://github.com/bartoszkopinski
465
535
  [@blocknotes]: https://github.com/blocknotes
466
536
  [@bolshakov]: https://github.com/bolshakov
467
537
  [@buren]: https://github.com/buren
468
538
  [@chancancode]: https://github.com/chancancode
539
+ [@chrp]: https://github.com/chrp
469
540
  [@chumakoff]: https://github.com/chumakoff
470
541
  [@craigmcnamara]: https://github.com/craigmcnamara
471
542
  [@DanielHeath]: https://github.com/DanielHeath
@@ -477,24 +548,39 @@ Please check [0-6-stable] for previous changes.
477
548
  [@drn]: https://github.com/drn
478
549
  [@eikes]: https://github.com/eikes
479
550
  [@f1sherman]: https://github.com/f1sherman
551
+ [@FabioRos]: https://github.com/FabioRos
480
552
  [@faucct]: https://github.com/faucct
481
553
  [@Fivell]: https://github.com/Fivell
482
554
  [@glebtv]: https://github.com/glebtv
483
555
  [@gonzedge]: https://github.com/gonzedge
556
+ [@guigs]: https://github.com/guigs
557
+ [@HappyKadaver]: https://github.com/HappyKadaver
484
558
  [@innparusu95]: https://github.com/innparusu95
485
559
  [@ionut998]: https://github.com/ionut998
560
+ [@irmela]: https://github.com/irmela
486
561
  [@jasl]: https://github.com/jasl
487
562
  [@javierjulio]: https://github.com/javierjulio
488
563
  [@jawa]: https://github.com/jawa
489
564
  [@JiiHu]: https://github.com/JiiHu
490
565
  [@johnnyshields]: https://github.com/johnnyshields
566
+ [@jscheid]: https://github.com/jscheid
567
+ [@juril33t]: https://github.com/juril33t
568
+ [@jwesorick]: https://github.com/jwesorick
491
569
  [@kjeldahl]: https://github.com/kjeldahl
570
+ [@ko-lem]: https://github.com/ko-lem
492
571
  [@kobeumut]: https://github.com/kobeumut
572
+ [@Kris-LIBIS]: https://github.com/Kris-LIBIS
573
+ [@kwent]: https://github.com/kwent
493
574
  [@leio10]: https://github.com/leio10
494
575
  [@markstory]: https://github.com/markstory
495
576
  [@mauriciopasquier]: https://github.com/mauriciopasquier
496
577
  [@mconiglio]: https://github.com/mconiglio
578
+ [@micred]: https://github.com/micred
579
+ [@mirelon]: https://github.com/mirelon
580
+ [@ndbroadbent]: https://github.com/ndbroadbent
497
581
  [@Nguyenanh]: https://github.com/Nguyenanh
582
+ [@orkhan]: https://github.com/orkhan
583
+ [@panasyuk]: https://github.com/panasyuk
498
584
  [@PChambino]: https://github.com/PChambino
499
585
  [@potatosalad]: https://github.com/potatosalad
500
586
  [@pranas]: https://github.com/pranas
@@ -502,6 +588,7 @@ Please check [0-6-stable] for previous changes.
502
588
  [@RobinvanderVliet]: https://github.com/RobinvanderVliet
503
589
  [@rogerkk]: https://github.com/rogerkk
504
590
  [@seanlinsley]: https://github.com/seanlinsley
591
+ [@sgara]: https://github.com/sgara
505
592
  [@ShallmentMo]: https://github.com/ShallmentMo
506
593
  [@shekibobo]: https://github.com/shekibobo
507
594
  [@shouya]: https://github.com/shouya
@@ -511,12 +598,10 @@ Please check [0-6-stable] for previous changes.
511
598
  [@timoschilling]: https://github.com/timoschilling
512
599
  [@TimPetricola]: https://github.com/TimPetricola
513
600
  [@varyonic]: https://github.com/varyonic
514
- [@wasifhossain]: https://github.com/wasifhossain
601
+ [@violeta-p]: https://github.com/violeta-p
515
602
  [@WaKeMaTTa]: https://github.com/WaKeMaTTa
603
+ [@wasifhossain]: https://github.com/wasifhossain
604
+ [@westonganger]: https://github.com/westonganger
516
605
  [@Wowu]: https://github.com/Wowu
517
606
  [@wspurgin]: https://github.com/wspurgin
518
607
  [@zorab47]: https://github.com/zorab47
519
- [@chrp]: https://github.com/chrp
520
- [@bartoszkopinski]: https://github.com/bartoszkopinski
521
- [@panasyuk]: https://github.com/panasyuk
522
- [@jscheid]: https://github.com/jscheid
@@ -5,15 +5,15 @@ 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
9
- [mailing list][] or [Stack Overflow][], [search the issue tracker][] to see if
10
- someone else in the community has already created a ticket. If not, go ahead and
11
- [make one][new issue]!
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]!
12
12
 
13
13
  ### Fork & create a branch
14
14
 
15
- If this is something you think you can fix, then [fork Active Admin][] and
16
- create a branch with a descriptive name.
15
+ If this is something you think you can fix, then [fork Active Admin] and create
16
+ a branch with a descriptive name.
17
17
 
18
18
  A good branch name would be (where issue #325 is the ticket you're working on):
19
19
 
@@ -26,8 +26,7 @@ git checkout -b 325-add-japanese-translations
26
26
  Make sure you're using a recent ruby and have the `bundler` gem installed, at
27
27
  least version `1.14.3`.
28
28
 
29
- You'll also need chrome and [chromedriver] installed in order to run cucumber
30
- scenarios.
29
+ You'll also need chrome installed in order to run cucumber scenarios.
31
30
 
32
31
  Now install the development dependencies:
33
32
 
@@ -35,36 +34,42 @@ Now install the development dependencies:
35
34
  bundle install
36
35
  ```
37
36
 
38
- Now you should be able to run the entire suite using:
37
+ Then install javascript dependencies with [Yarn] (requires a current version of [Node.js]):
39
38
 
40
39
  ```sh
41
- bin/rake
40
+ bin/yarn install
42
41
  ```
43
42
 
44
- The test run will generate a sample Rails application in `tmp/rails` to run the
45
- tests against.
43
+ JS assets are located in `app/javascript/active_admin`. The config will take care of compiling a complete bundle with [Rollup] using the `build` script and exported to `app/assets/javascripts/active_admin/base.js` ready to be used by Sprockets.
46
44
 
47
- If your tests are passing locally but they're failing on CircleCI, it's probably
48
- because of some breaking change or problem with the latest version of some
49
- dependency. You should be able to reproduce the issue locally by:
45
+ To update javascript bundle run (add `-w` flag for watch mode):
50
46
 
51
- * Removing the `Gemfile.lock` file.
52
- * Running `bundle install`.
53
- * Re-running the tests again like you did previously.
47
+ ```sh
48
+ bin/yarn build
49
+ ```
54
50
 
55
- This is not your fault though, so if this happens feel free to investigate, but
56
- also feel free to ping maintainers about the issue you just found.
51
+ Now you should be able to run the entire suite using:
52
+
53
+ ```sh
54
+ bin/rake
55
+ ```
56
+
57
+ The test run will generate a sample Rails application in `tmp/test_apps` to run the
58
+ tests against.
57
59
 
58
60
  If you want to test against a Rails version different from the latest, make sure
59
61
  you use the correct Gemfile, for example:
60
62
 
61
63
  ```sh
62
- export BUNDLE_GEMFILE=gemfiles/rails_51.gemfile
64
+ export BUNDLE_GEMFILE=gemfiles/rails_60/Gemfile
63
65
  ```
64
66
 
67
+ **Warning** SCSS assets are aimed to be used indifferently with Sprockets **and** webpacker.
68
+ As such, make sure not to use any sass-rails directives such as `asset-url` or `image-url`.
69
+
65
70
  ### Did you find a bug?
66
71
 
67
- * **Ensure the bug was not already reported** by [searching all issues][].
72
+ * **Ensure the bug was not already reported** by [searching all issues].
68
73
 
69
74
  * If you're unable to find an open issue addressing the problem,
70
75
  [open a new one][new issue]. Be sure to include a **title and clear
@@ -78,12 +83,12 @@ export BUNDLE_GEMFILE=gemfiles/rails_51.gemfile
78
83
  issue description**:
79
84
  * [**ActiveAdmin** master issues][master template]
80
85
 
81
- ### 5. Implement your fix or feature
86
+ ### Implement your fix or feature
82
87
 
83
88
  At this point, you're ready to make your changes! Feel free to ask for help;
84
89
  everyone is a beginner at first :smile_cat:
85
90
 
86
- ### 6. View your changes in a Rails application
91
+ ### View your changes in a Rails application
87
92
 
88
93
  Active Admin is meant to be used by humans, not cucumbers. So make sure to take
89
94
  a look at your changes in a browser.
@@ -95,7 +100,7 @@ bin/rake local server
95
100
  ```
96
101
 
97
102
  This will automatically create a Rails app if none already exists, and store it
98
- in the `.test-rails-apps` folder.
103
+ in the `tmp/development_apps` folder.
99
104
 
100
105
  You should now be able to open <http://localhost:3000/admin> in your browser.
101
106
  You can log in using:
@@ -124,6 +129,22 @@ checks as the rest of the project. `bin/rake lint` will give you feedback in
124
129
  this regard. You can check & fix style issues by running each linter
125
130
  individually. Run `bin/rake -T lint` to see the available linters.
126
131
 
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
+
127
148
  ### Make a Pull Request
128
149
 
129
150
  At this point, you should switch back to your master branch and make sure it's
@@ -204,7 +225,6 @@ Maintainers need to do the following to push out a release:
204
225
  * `bin/rake release`
205
226
 
206
227
  [chandler]: https://github.com/mattbrictson/chandler#2-configure-credentials
207
- [chromedriver]: https://sites.google.com/a/chromium.org/chromedriver/getting-started
208
228
  [mailing list]: http://groups.google.com/group/activeadmin
209
229
  [Stack Overflow]: http://stackoverflow.com/questions/tagged/activeadmin
210
230
  [search the issue tracker]: https://github.com/activeadmin/activeadmin/issues?q=something
@@ -215,3 +235,7 @@ Maintainers need to do the following to push out a release:
215
235
  [make a pull request]: https://help.github.com/articles/creating-a-pull-request
216
236
  [git rebasing]: http://git-scm.com/book/en/Git-Branching-Rebasing
217
237
  [interactive rebase]: https://help.github.com/articles/interactive-rebase
238
+ [shortcut reference links]: https://github.github.com/gfm/#shortcut-reference-link
239
+ [Rollup]: https://rollupjs.org/guide/en/#quick-start
240
+ [Yarn]: https://yarnpkg.com/en/docs/install
241
+ [Node.js]: https://nodejs.org/en/
data/README.md CHANGED
@@ -21,6 +21,11 @@ creating elegant backends for website administration.
21
21
  * Try the [live demo][demo].
22
22
  * The [wiki] includes links to tutorials, articles and sample projects.
23
23
 
24
+ ## For enterprise
25
+
26
+ Active Admin for enterprise is available via the Tidelift subscription. [Learn
27
+ More][tidelift_enterprise].
28
+
24
29
  ## Need help?
25
30
 
26
31
  Please use [StackOverflow][stackoverflow] for help requests and how-to questions.
@@ -39,7 +44,7 @@ to ask.
39
44
  ## Want to support us?
40
45
 
41
46
  If you want to support us financially, you can [help fund the project
42
- through a Tidelift subscription][tidelift]. By buying a Tidelift subscription
47
+ through a Tidelift subscription][tidelift_support]. By buying a Tidelift subscription
43
48
  you make sure your whole dependency stack is properly maintained, while also
44
49
  getting a comprehensive view of outdated dependencies, new releases, security
45
50
  alerts, and licensing compatibility issues.
@@ -96,6 +101,8 @@ Thanks to [Open Collective][opencollective contributors] and all our Open Collec
96
101
  [inch]: http://inch-ci.org/github/activeadmin/activeadmin
97
102
  [tidelift_badge]: https://tidelift.com/badges/github/activeadmin/activeadmin
98
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
105
+ [tidelift_support]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=github&utm_content=support
99
106
 
100
107
  [docs]: http://activeadmin.info/0-installation.html
101
108
  [demo]: http://demo.activeadmin.info/admin