activeadmin 2.3.1 → 2.7.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 (88) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +120 -35
  3. data/CONTRIBUTING.md +51 -55
  4. data/README.md +2 -2
  5. data/app/assets/javascripts/active_admin/base.js +519 -0
  6. data/app/assets/stylesheets/active_admin/_base.scss +29 -29
  7. data/app/assets/stylesheets/active_admin/_header.scss +40 -8
  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 +8 -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 +28 -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} +4 -2
  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/layouts/active_admin_logged_out.html.erb +15 -5
  35. data/config/locales/az.yml +138 -0
  36. data/config/locales/de.yml +18 -0
  37. data/config/locales/en-CA.yml +3 -3
  38. data/config/locales/en-GB.yml +3 -3
  39. data/config/locales/en.yml +3 -3
  40. data/config/locales/es.yml +3 -3
  41. data/config/locales/fr.yml +4 -4
  42. data/config/locales/lv.yml +2 -2
  43. data/config/locales/sk.yml +59 -0
  44. data/config/locales/vi.yml +6 -5
  45. data/docs/0-installation.md +26 -2
  46. data/docs/1-general-configuration.md +20 -0
  47. data/docs/2-resource-customization.md +10 -1
  48. data/docs/3-index-pages.md +1 -1
  49. data/docs/9-batch-actions.md +2 -2
  50. data/docs/Gemfile.lock +103 -103
  51. data/docs/_includes/top-menu.html +1 -1
  52. data/docs/documentation.md +1 -1
  53. data/docs/index.html +6 -6
  54. data/lib/active_admin.rb +0 -1
  55. data/lib/active_admin/application.rb +1 -1
  56. data/lib/active_admin/csv_builder.rb +7 -3
  57. data/lib/active_admin/filters/active_filter.rb +1 -1
  58. data/lib/active_admin/filters/resource_extension.rb +24 -0
  59. data/lib/active_admin/inputs/filters/date_range_input.rb +15 -12
  60. data/lib/active_admin/localizers/resource_localizer.rb +1 -1
  61. data/lib/active_admin/menu.rb +5 -2
  62. data/lib/active_admin/namespace_settings.rb +16 -0
  63. data/lib/active_admin/order_clause.rb +1 -1
  64. data/lib/active_admin/resource.rb +1 -1
  65. data/lib/active_admin/resource/naming.rb +1 -1
  66. data/lib/active_admin/resource_controller/decorators.rb +2 -2
  67. data/lib/active_admin/resource_controller/polymorphic_routes.rb +3 -2
  68. data/lib/active_admin/version.rb +1 -1
  69. data/lib/active_admin/views/components/paginated_collection.rb +2 -1
  70. data/lib/active_admin/views/components/scopes.rb +2 -0
  71. data/lib/active_admin/views/components/table_for.rb +2 -1
  72. data/lib/active_admin/views/pages/base.rb +9 -5
  73. data/lib/active_admin/views/pages/index.rb +1 -0
  74. data/lib/generators/active_admin/install/install_generator.rb +7 -1
  75. data/lib/generators/active_admin/install/templates/active_admin.rb.erb +21 -1
  76. data/lib/generators/active_admin/webpacker/plugins/jquery.js +7 -0
  77. data/lib/generators/active_admin/webpacker/templates/active_admin.js +5 -0
  78. data/lib/generators/active_admin/webpacker/templates/active_admin.scss +17 -0
  79. data/lib/generators/active_admin/webpacker/templates/print.scss +2 -0
  80. data/lib/generators/active_admin/webpacker/webpacker_generator.rb +26 -0
  81. metadata +32 -43
  82. data/app/assets/images/active_admin/nested_menu_arrow.gif +0 -0
  83. data/app/assets/images/active_admin/nested_menu_arrow_dark.gif +0 -0
  84. data/app/assets/images/active_admin/orderable.png +0 -0
  85. data/app/assets/javascripts/active_admin/base.es6 +0 -23
  86. data/app/assets/javascripts/active_admin/initializers/filters.es6 +0 -45
  87. data/app/assets/javascripts/active_admin/lib/active_admin.es6 +0 -41
  88. 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: 563d1b0d5a864fbade2689270fb82575242d8c557f4c4807e45d5fb6d3679ccb
4
- data.tar.gz: 0076ad12634d0c8762697204639d0ce9447f051fd4b6827da3a09e4fdf7dcb1b
3
+ metadata.gz: 6ab0e48981374c48c42109adc93edce137eed195218c8b7d26a8895f1a3e3e85
4
+ data.tar.gz: f4a1228efba99ed7d3bdcd93330fb7687fd321521e7ca521c1363ed1a72f3bf6
5
5
  SHA512:
6
- metadata.gz: 7cdc8ddd8ba6452996a80f098cde70512a83215c4731d03b7a0b0a9d601f5886c12f5db824be5aaf0ecb92a8151f0685ad65f95d1c7f623767613f4a46e29617
7
- data.tar.gz: 7b14dc13a08928a73f48bfcd4972d20b4a2d33db3c29afb1769ab63c3654cbe6e711e6ff8f39b4b131af6c94c060ac6b5056abb6494cafc4b6c3a13f99bbb7db
6
+ metadata.gz: 3c98537ec2c59cfca738a38c5a0c905f15f55fa4aafb3bb9680880f628e89ad8226458b1a950a9ce717c01bc7a72dd6e6b906c77088a0096bf9b4397ae9475bd
7
+ data.tar.gz: 3af41a29c2c5602198b7f614360f223c53c2f0c47b931fca189f30d96decfc4211697dea7cfc364e1ea218015259622c2180a15b0164db86615255363ca983f5
@@ -2,6 +2,69 @@
2
2
 
3
3
  ## Unreleased
4
4
 
5
+ ## 2.7.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.6.1..v2.7.0)
6
+
7
+ ### Enhancements
8
+
9
+ * Extend menu to allow for nested submenus. [#5994] by [@taralbass]
10
+ * Add Webpacker compatibility with opt-in config switch and installation generator. [#5855] by [@sgara]
11
+
12
+ ### Bug Fixes
13
+
14
+ * Fix scopes renderer when resource has only optional scopes and their conditions are false. [#6149] by [@Looooong]
15
+ * Fix some missing wrapper markup in "logged out" layout. [#6086] by [@irmela]
16
+ * Fix some typos in Vietnamese translation. [#6099] by [@giapnhdev]
17
+
18
+ ## 2.6.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.6.0..v2.6.1)
19
+
20
+ ### Bug Fixes
21
+
22
+ * Fix some ruby 2.7 warnings about keyword args. [#6000] by [@vcsjones]
23
+ * Missing `create_another` translation in Vietnamese. [#6002] by [@imcvampire]
24
+ * Using "destroy" for user facing message is too robotic, prefer "delete". [#6047] by [@vfonic]
25
+ * Typo in confirmation message for comment deletion. [#6047] by [@vfonic]
26
+
27
+ ## 2.6.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.5.0..v2.6.0)
28
+
29
+ ### Enhancements
30
+
31
+ * Display multiple flash messages in separate elements. [#5929] by [@mirelon]
32
+ * Make delete confirmation messages in French & Spanish gender-neutral. [#5946] by [@cprodhomme]
33
+
34
+ ### Bug Fixes
35
+
36
+ * Export ModalDialog component to re-enable client side usage. [#5956] by [@sgara]
37
+ * Use default ActionView options instead of default Formtastic options for DateRangeInput [#5957] by [@mirelon]
38
+ * Fix i18n key in docs example to translate scopes. [#5943] by [@adler99]
39
+
40
+ ## 2.5.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.4.0..v2.5.0)
41
+
42
+ ### Enhancements
43
+
44
+ * Azerbaijani translation. [#5078] by [@orkhan]
45
+
46
+ ### Bug Fixes
47
+
48
+ * Convert namespace to sym to prevent duplicate namespaces such as :foo and 'foo'. [#5931] by [@westonganger]
49
+ * Use filter label when condition has a predicate. [#5886] by [@ko-lem]
50
+ * Fix error when routing with array containing symbol. [#5870] by [@jwesorick]
51
+ * Fix error when there is a model named `Tag` and `meta_tags` have been configured. [#5895] by [@micred], [@FabioRos] and [@deivid-rodriguez]
52
+ * Allow specifying custom `input_html` for `DateRangeInput`. [#5867] by [@mirelon]
53
+ * Adjust `#main_content` right margin to take into account possible custom values of `$sidebar-width` and `$section-padding`. [#5887] by [@guigs]
54
+ * Improved polymorphic routes generation to avoid problems when multiple `belongs_to` are defined. [#5938] by [@leio10]
55
+
56
+ ### Dependency Changes
57
+
58
+ * Support for Rails 5.0 and Rails 5.1 has been dropped. [#5877] by [@deivid-rodriguez]
59
+
60
+ ## 2.4.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.3.1..v2.4.0)
61
+
62
+ ### Enhancements
63
+
64
+ * Make optimization to not use expensive COUNT queries also work for decorated actions. [#5811] by [@irmela]
65
+ * Render a text filter instead of a select for large associations (opt-in). [#5548] by [@DanielHeath]
66
+ * Improve German translations. [#5874] by [@juril33t]
67
+
5
68
  ## 2.3.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.3.0..v2.3.1)
6
69
 
7
70
  ### Bug Fixes
@@ -12,8 +75,6 @@
12
75
 
13
76
  ### Enhancements
14
77
 
15
- #### Minor
16
-
17
78
  * Bump minimum ransack requirement to make sure everyone gets a version that works ok with all supported versions of Rails. [#5831] by [@deivid-rodriguez]
18
79
 
19
80
  ### Bug Fixes
@@ -28,14 +89,12 @@
28
89
 
29
90
  ### Enhancements
30
91
 
31
- #### Minor
32
-
33
92
  * 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]
34
93
  * Add Macedonian locale. [#5710] by [@violeta-p]
35
94
 
36
95
  ### Bug Fixes
37
96
 
38
- * Fix pundit policy retrieving for static pages when the pundit namespace is :active_admin. [#5777] by [@kwent]
97
+ * Fix pundit policy retrieving for static pages when the pundit namespace is `:active_admin`. [#5777] by [@kwent]
39
98
  * Fix show page title not being properly escaped if title's content included HTML. [#5802] by [@deivid-rodriguez]
40
99
  * Revert [21b6138f] from [#5740] since it actually caused the performance in development to regress. [#5801] by [@deivid-rodriguez]
41
100
 
@@ -47,7 +106,7 @@
47
106
  * Crash when rendering comments from a custom controller block. [#5758] by [@deivid-rodriguez]
48
107
  * 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]
49
108
 
50
- ### Removals
109
+ ### Dependency Changes
51
110
 
52
111
  * Support for ruby 2.3 has been removed. [#5751] by [@deivid-rodriguez]
53
112
 
@@ -59,8 +118,6 @@ _No changes_.
59
118
 
60
119
  ### Enhancements
61
120
 
62
- #### Minor
63
-
64
121
  * Require arbre `~> 1.2, >= 1.2.1`. [#5726] by [@ionut998], and [#5738] by [@deivid-rodriguez]
65
122
 
66
123
  ## 2.0.0.rc1 [☰](https://github.com/activeadmin/activeadmin/compare/v1.4.3..v2.0.0.rc1)
@@ -76,9 +133,6 @@ _No changes_.
76
133
  ```
77
134
 
78
135
  * Consider authorization when displaying comments in show page. [#5555] by [@amiuhle]
79
-
80
- #### Minor
81
-
82
136
  * Add better support for rendering lists. [#5370] by [@dkniffin]
83
137
  * 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]
84
138
 
@@ -95,7 +149,7 @@ _No changes_.
95
149
  * Sidebar title internationalization. [#5417] by [@WaKeMaTTa]
96
150
  * `filter` labels not allowing a `Proc` to be passed. [#5418] by [@WaKeMaTTa]
97
151
 
98
- ### Removals
152
+ ### Dependency Changes
99
153
 
100
154
  * Rails 4.2 support has been dropped. [#5104] by [@javierjulio] and [@deivid-rodriguez]
101
155
  * Dependency on coffee-rails has been removed. [#5081] by [@javierjulio]
@@ -131,8 +185,6 @@ _No changes_.
131
185
 
132
186
  ### Enhancements
133
187
 
134
- #### Minor
135
-
136
188
  * Add missing I18n for comments. [#5458], [#5461] by [@mauriciopasquier]
137
189
  * Fix batch_actions.delete_confirmation translation in zh-CN.yml. [#5453] by [@ShallmentMo]
138
190
  * Add some missing italian translations. [#5433] by [@stefsava]
@@ -170,8 +222,6 @@ _No changes_.
170
222
 
171
223
  ### Enhancements
172
224
 
173
- #### Major
174
-
175
225
  * Rails 5.2 support [#5343] by [@varyonic], [#5399], [#5401] by [@zorab47]
176
226
 
177
227
  ## 1.2.1 [☰](https://github.com/activeadmin/activeadmin/compare/v1.2.0..v1.2.1)
@@ -184,8 +234,6 @@ _No changes_.
184
234
 
185
235
  ### Enhancements
186
236
 
187
- #### Minor
188
-
189
237
  * Do not display pagination info when there are no comments. [#5119] by [@alex-bogomolov]
190
238
  * Revert generated config files to pluralized. [#5120] by [@varyonic], [#5137] by [@deivid-rodriguez]
191
239
  * Warn when action definition overwrites controller method. [#5167] by [@aarek]
@@ -216,7 +264,7 @@ _No changes_.
216
264
  * Fixed [#5043]. Do not crash in sidebar rendering when a default scope is not specified. [#5044] by [@Fivell]
217
265
  * Fixed [#3894]. Make tab's component work with non-ascii titles. [#5046] by [@Fivell]
218
266
 
219
- ### Removals
267
+ ### Dependency Changes
220
268
 
221
269
  * Ruby 2.1 support has been dropped. [#5003] by [@deivid-rodriguez]
222
270
  * Replaced `sass-rails` with `sass` dependency. [#5037] by [@javierjulio]
@@ -254,8 +302,6 @@ _No changes_.
254
302
 
255
303
  ### Enhancements
256
304
 
257
- #### Minor
258
-
259
305
  * Support proc as an input_html option value when declaring filters. [#5029] by [@Fivell]
260
306
  * Base localization support, better associations handling for active filters sidebar. [#4951] by [@Fivell]
261
307
  * Allow AA scopes to return paginated collections. [#4996] by [@Fivell]
@@ -279,16 +325,11 @@ _No changes_.
279
325
 
280
326
  ### Enhancements
281
327
 
282
- #### Major
283
-
284
328
  * Migration from Metasearch to Ransack. [#1979] by [@seanlinsley]
285
329
  * Rails 4 support. [#2326] by many people :heart:
286
330
  * Rails 4.2 support. [#3731] by [@gonzedge] and [@timoschilling]
287
331
  * Rails 5 support. [#4254] by [@seanlinsley]
288
332
  * Rails 5.1 support. [#4882] by [@varyonic]
289
-
290
- #### Minor
291
-
292
333
  * "Create another" checkbox for the new resource page. [#4477] by [@bolshakov]
293
334
  * Page supports belongs_to. [#4759] by [@Fivell] and [@zorab47]
294
335
  * Support for custom sorting strategies. [#4768] by [@Fivell]
@@ -419,6 +460,7 @@ Please check [0-6-stable] for previous changes.
419
460
  [#5052]: https://github.com/activeadmin/activeadmin/pull/5052
420
461
  [#5060]: https://github.com/activeadmin/activeadmin/pull/5060
421
462
  [#5069]: https://github.com/activeadmin/activeadmin/pull/5069
463
+ [#5078]: https://github.com/activeadmin/activeadmin/pull/5078
422
464
  [#5081]: https://github.com/activeadmin/activeadmin/pull/5081
423
465
  [#5088]: https://github.com/activeadmin/activeadmin/pull/5088
424
466
  [#5093]: https://github.com/activeadmin/activeadmin/pull/5093
@@ -499,25 +541,54 @@ Please check [0-6-stable] for previous changes.
499
541
  [#5800]: https://github.com/activeadmin/activeadmin/pull/5800
500
542
  [#5801]: https://github.com/activeadmin/activeadmin/pull/5801
501
543
  [#5802]: https://github.com/activeadmin/activeadmin/pull/5802
544
+ [#5811]: https://github.com/activeadmin/activeadmin/pull/5811
502
545
  [#5816]: https://github.com/activeadmin/activeadmin/pull/5816
503
546
  [#5822]: https://github.com/activeadmin/activeadmin/pull/5822
504
547
  [#5826]: https://github.com/activeadmin/activeadmin/pull/5826
505
548
  [#5831]: https://github.com/activeadmin/activeadmin/pull/5831
549
+ [#5548]: https://github.com/activeadmin/activeadmin/pull/5548
506
550
  [#5842]: https://github.com/activeadmin/activeadmin/pull/5842
507
551
  [#5854]: https://github.com/activeadmin/activeadmin/pull/5854
552
+ [#5855]: https://github.com/activeadmin/activeadmin/pull/5855
553
+ [#5874]: https://github.com/activeadmin/activeadmin/pull/5874
554
+ [#5877]: https://github.com/activeadmin/activeadmin/pull/5877
555
+ [#5886]: https://github.com/activeadmin/activeadmin/pull/5886
556
+ [#5870]: https://github.com/activeadmin/activeadmin/pull/5870
557
+ [#5894]: https://github.com/activeadmin/activeadmin/pull/5894
558
+ [#5895]: https://github.com/activeadmin/activeadmin/pull/5895
559
+ [#5867]: https://github.com/activeadmin/activeadmin/pull/5867
560
+ [#5887]: https://github.com/activeadmin/activeadmin/pull/5887
561
+ [#5931]: https://github.com/activeadmin/activeadmin/pull/5931
562
+ [#5938]: https://github.com/activeadmin/activeadmin/pull/5938
563
+ [#5929]: https://github.com/activeadmin/activeadmin/pull/5929
564
+ [#5943]: https://github.com/activeadmin/activeadmin/pull/5943
565
+ [#5946]: https://github.com/activeadmin/activeadmin/pull/5946
566
+ [#5956]: https://github.com/activeadmin/activeadmin/pull/5956
567
+ [#5957]: https://github.com/activeadmin/activeadmin/pull/5957
568
+ [#6000]: https://github.com/activeadmin/activeadmin/pull/6000
569
+ [#6002]: https://github.com/activeadmin/activeadmin/pull/6002
570
+ [#6047]: https://github.com/activeadmin/activeadmin/pull/6047
571
+ [#5994]: https://github.com/activeadmin/activeadmin/pull/5994
572
+ [#6149]: https://github.com/activeadmin/activeadmin/pull/6149
573
+ [#6086]: https://github.com/activeadmin/activeadmin/pull/6086
574
+ [#6099]: https://github.com/activeadmin/activeadmin/pull/6099
508
575
 
509
576
  [@5t111111]: https://github.com/5t111111
510
577
  [@aarek]: https://github.com/aarek
578
+ [@adler99]: https://github.com/adler99
511
579
  [@ajw725]: https://github.com/ajw725
512
580
  [@alex-bogomolov]: https://github.com/alex-bogomolov
513
581
  [@amiel]: https://github.com/amiel
514
582
  [@amiuhle]: https://github.com/amiuhle
515
583
  [@andreslemik]: https://github.com/andreslemik
584
+ [@bartoszkopinski]: https://github.com/bartoszkopinski
516
585
  [@blocknotes]: https://github.com/blocknotes
517
586
  [@bolshakov]: https://github.com/bolshakov
518
587
  [@buren]: https://github.com/buren
519
588
  [@chancancode]: https://github.com/chancancode
589
+ [@chrp]: https://github.com/chrp
520
590
  [@chumakoff]: https://github.com/chumakoff
591
+ [@cprodhomme]: https://github.com/cprodhomme
521
592
  [@craigmcnamara]: https://github.com/craigmcnamara
522
593
  [@DanielHeath]: https://github.com/DanielHeath
523
594
  [@deivid-rodriguez]: https://github.com/deivid-rodriguez
@@ -528,26 +599,42 @@ Please check [0-6-stable] for previous changes.
528
599
  [@drn]: https://github.com/drn
529
600
  [@eikes]: https://github.com/eikes
530
601
  [@f1sherman]: https://github.com/f1sherman
602
+ [@FabioRos]: https://github.com/FabioRos
531
603
  [@faucct]: https://github.com/faucct
532
604
  [@Fivell]: https://github.com/Fivell
605
+ [@giapnhdev]: https://github.com/giapnhdev
533
606
  [@glebtv]: https://github.com/glebtv
534
607
  [@gonzedge]: https://github.com/gonzedge
608
+ [@guigs]: https://github.com/guigs
535
609
  [@HappyKadaver]: https://github.com/HappyKadaver
610
+ [@imcvampire]: https://github.com/imcvampire
536
611
  [@innparusu95]: https://github.com/innparusu95
537
612
  [@ionut998]: https://github.com/ionut998
613
+ [@irmela]: https://github.com/irmela
538
614
  [@jasl]: https://github.com/jasl
539
615
  [@javierjulio]: https://github.com/javierjulio
540
616
  [@jawa]: https://github.com/jawa
541
617
  [@JiiHu]: https://github.com/JiiHu
542
618
  [@johnnyshields]: https://github.com/johnnyshields
619
+ [@jscheid]: https://github.com/jscheid
620
+ [@juril33t]: https://github.com/juril33t
621
+ [@jwesorick]: https://github.com/jwesorick
543
622
  [@kjeldahl]: https://github.com/kjeldahl
623
+ [@ko-lem]: https://github.com/ko-lem
544
624
  [@kobeumut]: https://github.com/kobeumut
625
+ [@Kris-LIBIS]: https://github.com/Kris-LIBIS
545
626
  [@kwent]: https://github.com/kwent
546
627
  [@leio10]: https://github.com/leio10
628
+ [@Looooong]: https://github.com/Looooong
547
629
  [@markstory]: https://github.com/markstory
548
630
  [@mauriciopasquier]: https://github.com/mauriciopasquier
549
631
  [@mconiglio]: https://github.com/mconiglio
632
+ [@micred]: https://github.com/micred
633
+ [@mirelon]: https://github.com/mirelon
634
+ [@ndbroadbent]: https://github.com/ndbroadbent
550
635
  [@Nguyenanh]: https://github.com/Nguyenanh
636
+ [@orkhan]: https://github.com/orkhan
637
+ [@panasyuk]: https://github.com/panasyuk
551
638
  [@PChambino]: https://github.com/PChambino
552
639
  [@potatosalad]: https://github.com/potatosalad
553
640
  [@pranas]: https://github.com/pranas
@@ -555,25 +642,23 @@ Please check [0-6-stable] for previous changes.
555
642
  [@RobinvanderVliet]: https://github.com/RobinvanderVliet
556
643
  [@rogerkk]: https://github.com/rogerkk
557
644
  [@seanlinsley]: https://github.com/seanlinsley
645
+ [@sgara]: https://github.com/sgara
558
646
  [@ShallmentMo]: https://github.com/ShallmentMo
559
647
  [@shekibobo]: https://github.com/shekibobo
560
648
  [@shouya]: https://github.com/shouya
561
649
  [@stefsava]: https://github.com/stefsava
562
650
  [@stereoscott]: https://github.com/stereoscott
651
+ [@taralbass]: https://github.com/taralbass
563
652
  [@tiagotex]: https://github.com/tiagotex
564
653
  [@timoschilling]: https://github.com/timoschilling
565
654
  [@TimPetricola]: https://github.com/TimPetricola
566
655
  [@varyonic]: https://github.com/varyonic
567
- [@wasifhossain]: https://github.com/wasifhossain
656
+ [@vcsjones]: https://github.com/vcsjones
657
+ [@vfonic]: https://github.com/vfonic
658
+ [@violeta-p]: https://github.com/violeta-p
568
659
  [@WaKeMaTTa]: https://github.com/WaKeMaTTa
660
+ [@wasifhossain]: https://github.com/wasifhossain
661
+ [@westonganger]: https://github.com/westonganger
569
662
  [@Wowu]: https://github.com/Wowu
570
663
  [@wspurgin]: https://github.com/wspurgin
571
664
  [@zorab47]: https://github.com/zorab47
572
- [@chrp]: https://github.com/chrp
573
- [@bartoszkopinski]: https://github.com/bartoszkopinski
574
- [@panasyuk]: https://github.com/panasyuk
575
- [@jscheid]: https://github.com/jscheid
576
- [@violeta-p]: https://github.com/violeta-p
577
- [@ndbroadbent]: https://github.com/ndbroadbent
578
- [@Kris-LIBIS]: https://github.com/Kris-LIBIS
579
- [@sgara]: https://github.com/sgara
@@ -5,15 +5,17 @@ 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 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
 
15
- If this is something you think you can fix, then [fork Active Admin][] and
16
- create a branch with a descriptive name.
17
+ If this is something you think you can fix, then [fork Active Admin] and create
18
+ a branch with a descriptive name.
17
19
 
18
20
  A good branch name would be (where issue #325 is the ticket you're working on):
19
21
 
@@ -34,6 +36,20 @@ Now install the development dependencies:
34
36
  bundle install
35
37
  ```
36
38
 
39
+ Then install javascript dependencies with [Yarn] (requires a current version of [Node.js]):
40
+
41
+ ```sh
42
+ bin/yarn install
43
+ ```
44
+
45
+ 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
+
47
+ To update javascript bundle run (add `-w` flag for watch mode):
48
+
49
+ ```sh
50
+ bin/yarn build
51
+ ```
52
+
37
53
  Now you should be able to run the entire suite using:
38
54
 
39
55
  ```sh
@@ -43,46 +59,22 @@ bin/rake
43
59
  The test run will generate a sample Rails application in `tmp/test_apps` to run the
44
60
  tests against.
45
61
 
46
- If your tests are passing locally but they're failing on CircleCI, it's probably
47
- because of some breaking change or problem with the latest version of some
48
- dependency. You should be able to reproduce the issue locally by:
49
-
50
- * Removing the `Gemfile.lock` file.
51
- * Running `bundle install`.
52
- * Re-running the tests again like you did previously.
53
-
54
- This is not your fault though, so if this happens feel free to investigate, but
55
- also feel free to ping maintainers about the issue you just found.
56
-
57
62
  If you want to test against a Rails version different from the latest, make sure
58
63
  you use the correct Gemfile, for example:
59
64
 
60
65
  ```sh
61
- export BUNDLE_GEMFILE=gemfiles/rails_51.gemfile
66
+ export BUNDLE_GEMFILE=gemfiles/rails_60/Gemfile
62
67
  ```
63
68
 
64
- ### Did you find a bug?
65
-
66
- * **Ensure the bug was not already reported** by [searching all issues][].
67
-
68
- * If you're unable to find an open issue addressing the problem,
69
- [open a new one][new issue]. Be sure to include a **title and clear
70
- description**, as much relevant information as possible, and a **code sample**
71
- or an **executable test case** demonstrating the expected behavior that is not
72
- occurring.
73
-
74
- * If possible, use the relevant bug report templates to create the issue.
75
- Simply copy the content of the appropriate template into a .rb file, make the
76
- necessary changes to demonstrate the issue, and **paste the content into the
77
- issue description**:
78
- * [**ActiveAdmin** master issues][master template]
69
+ **Warning** SCSS assets are aimed to be used indifferently with Sprockets **and** webpacker.
70
+ As such, make sure not to use any sass-rails directives such as `asset-url` or `image-url`.
79
71
 
80
- ### 5. Implement your fix or feature
72
+ ### Implement your fix or feature
81
73
 
82
74
  At this point, you're ready to make your changes! Feel free to ask for help;
83
75
  everyone is a beginner at first :smile_cat:
84
76
 
85
- ### 6. View your changes in a Rails application
77
+ ### View your changes in a Rails application
86
78
 
87
79
  Active Admin is meant to be used by humans, not cucumbers. So make sure to take
88
80
  a look at your changes in a browser.
@@ -123,6 +115,22 @@ checks as the rest of the project. `bin/rake lint` will give you feedback in
123
115
  this regard. You can check & fix style issues by running each linter
124
116
  individually. Run `bin/rake -T lint` to see the available linters.
125
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
+
126
134
  ### Make a Pull Request
127
135
 
128
136
  At this point, you should switch back to your master branch and make sure it's
@@ -183,33 +191,21 @@ met.
183
191
  Maintainers need to do the following to push out a release:
184
192
 
185
193
  * Make sure all pull requests are in and that changelog is current
186
- * Update `version.rb` file and changelog with new version number
187
- * If it's not a patch level release, create a stable branch for that release,
188
- otherwise switch to the stable branch corresponding to the patch release you
189
- want to ship:
190
-
191
- ```sh
192
- git checkout master
193
- git fetch activeadmin
194
- git rebase activeadmin/master
195
- # If the release is 2.1.x then this should be: 2-1-stable
196
- git checkout -b N-N-stable
197
- git push activeadmin N-N-stable:N-N-stable
198
- ```
199
-
194
+ * Switch to the master branch and make sure it's up to date.
200
195
  * Make sure you have [chandler] properly configured. Chandler is used to
201
196
  automatically submit github release notes from the changelog right after
202
197
  pushing the gem to rubygems.
203
- * `bin/rake release`
198
+ * Run one of `bin/rake release:prepare_{prerelease,prepatch,patch,preminor,minor,premajor,major}`, push the result and create a PR.
199
+ * Run `bin/rake release` from the target branch once the PR is merged.
204
200
 
205
201
  [chandler]: https://github.com/mattbrictson/chandler#2-configure-credentials
206
- [mailing list]: http://groups.google.com/group/activeadmin
207
202
  [Stack Overflow]: http://stackoverflow.com/questions/tagged/activeadmin
208
- [search the issue tracker]: https://github.com/activeadmin/activeadmin/issues?q=something
209
203
  [new issue]: https://github.com/activeadmin/activeadmin/issues/new
210
204
  [fork Active Admin]: https://help.github.com/articles/fork-a-repo
211
- [searching all issues]: https://github.com/activeadmin/activeadmin/issues?q=
212
- [master template]: https://github.com/activeadmin/activeadmin/blob/master/tasks/bug_report_template.rb
213
205
  [make a pull request]: https://help.github.com/articles/creating-a-pull-request
214
206
  [git rebasing]: http://git-scm.com/book/en/Git-Branching-Rebasing
215
- [interactive rebase]: https://help.github.com/articles/interactive-rebase
207
+ [interactive rebase]: https://help.github.com/en/github/using-git/about-git-rebase
208
+ [shortcut reference links]: https://github.github.com/gfm/#shortcut-reference-link
209
+ [Rollup]: https://rollupjs.org/guide/en/#quick-start
210
+ [Yarn]: https://yarnpkg.com/en/docs/install
211
+ [Node.js]: https://nodejs.org/en/