activeadmin 2.3.0 → 2.6.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 (74) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +106 -35
  3. data/CONTRIBUTING.md +50 -54
  4. data/README.md +1 -1
  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 +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 +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/config/locales/az.yml +138 -0
  35. data/config/locales/de.yml +18 -0
  36. data/config/locales/en-CA.yml +3 -3
  37. data/config/locales/en-GB.yml +3 -3
  38. data/config/locales/en.yml +3 -3
  39. data/config/locales/es.yml +3 -3
  40. data/config/locales/fr.yml +4 -4
  41. data/config/locales/lv.yml +2 -2
  42. data/config/locales/sk.yml +59 -0
  43. data/config/locales/vi.yml +1 -0
  44. data/docs/1-general-configuration.md +20 -0
  45. data/docs/3-index-pages.md +1 -1
  46. data/docs/9-batch-actions.md +2 -2
  47. data/docs/Gemfile.lock +103 -103
  48. data/lib/active_admin.rb +0 -1
  49. data/lib/active_admin/application.rb +1 -1
  50. data/lib/active_admin/csv_builder.rb +7 -3
  51. data/lib/active_admin/filters/active_filter.rb +1 -1
  52. data/lib/active_admin/filters/resource_extension.rb +24 -0
  53. data/lib/active_admin/inputs/filters/date_range_input.rb +15 -12
  54. data/lib/active_admin/localizers/resource_localizer.rb +1 -1
  55. data/lib/active_admin/namespace_settings.rb +13 -0
  56. data/lib/active_admin/order_clause.rb +1 -1
  57. data/lib/active_admin/resource.rb +1 -1
  58. data/lib/active_admin/resource/naming.rb +1 -1
  59. data/lib/active_admin/resource_controller/decorators.rb +2 -2
  60. data/lib/active_admin/resource_controller/polymorphic_routes.rb +3 -2
  61. data/lib/active_admin/version.rb +1 -1
  62. data/lib/active_admin/views/components/paginated_collection.rb +2 -1
  63. data/lib/active_admin/views/components/table_for.rb +1 -0
  64. data/lib/active_admin/views/pages/base.rb +5 -3
  65. data/lib/active_admin/views/pages/index.rb +1 -0
  66. data/lib/generators/active_admin/install/templates/active_admin.rb.erb +14 -1
  67. metadata +35 -45
  68. data/app/assets/images/active_admin/nested_menu_arrow.gif +0 -0
  69. data/app/assets/images/active_admin/nested_menu_arrow_dark.gif +0 -0
  70. data/app/assets/images/active_admin/orderable.png +0 -0
  71. data/app/assets/javascripts/active_admin/base.es6 +0 -23
  72. data/app/assets/javascripts/active_admin/initializers/filters.es6 +0 -45
  73. data/app/assets/javascripts/active_admin/lib/active_admin.es6 +0 -41
  74. 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: 7c8782460aa60e1293d44be5e3b998002e34794150cebf3c4effc6ba409149d8
4
- data.tar.gz: b5834e4dc64f9043142376093ace0ddf0af7119f1a4dbba257ed344a4ac7079a
3
+ metadata.gz: 8ce87c19dbaccfc28fd5c36d12f1ef679772a70bd1ae8a131182d277d3de4cb3
4
+ data.tar.gz: d0b56716796cb013d8d874280366d8fb424366ee3979bf6549585ef505836d79
5
5
  SHA512:
6
- metadata.gz: c55ad8c616ffee8776434ac4626351a4e789a9cb4d0771da2c548517d9854c5c3fa66f3e9b856831c625bc8f0f8c6afe85d3cf9f28101ec54467fce8d97b43cc
7
- data.tar.gz: 336e001de67c48174e8611f20007dc2a762eac47f09a4d6b3ad4ee6deb090410d072c58d1e3f61e8fc4a4cf1615e4a633f8210abd93979dd07a2d55f2510d4ef
6
+ metadata.gz: fcda92e560081295c175f08b876594a5bc3ea38cfcb523a15e803a086c97306574801d279ffc2f553902a4aaf2e77eece4b4e065bb26a11f12e031b2d0a94257
7
+ data.tar.gz: ca2e295171c638b40f376bf8fd56a7027c79d08a063b534a666b9761e5f4102b436bfc34cc99b3cf8bab7a12a586fe7c702f62661a885f1291974efb73b14490
@@ -2,11 +2,65 @@
2
2
 
3
3
  ## Unreleased
4
4
 
5
- ## 2.3.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.2.0..v2.3.0)
5
+ ## 2.6.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.6.0..2.6.1)
6
+
7
+ ### Bug Fixes
8
+
9
+ * Fix some ruby 2.7 warnings about keyword args. [#6000] by [@vcsjones]
10
+ * Missing `create_another` translation in Vietnamese. [#6002] by [@imcvampire]
11
+ * Using "destroy" for user facing message is too robotic, prefer "delete". [#6047] by [@vfonic]
12
+ * Typo in confirmation message for comment deletion. [#6047] by [@vfonic]
13
+
14
+ ## 2.6.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.5.0..v2.6.0)
15
+
16
+ ### Enhacements
17
+
18
+ * Display multiple flash messages in separate elements. [#5929] by [@mirelon]
19
+ * Make delete confirmation messages in French & Spanish gender-neutral. [#5946] by [@cprodhomme]
20
+
21
+ ### Bug Fixes
22
+
23
+ * Export ModalDialog component to re-enable client side usage. [#5956] by [@sgara]
24
+ * Use default ActionView options instead of default Formtastic options for DateRangeInput [#5957] by [@mirelon]
25
+ * Fix i18n key in docs example to translate scopes. [#5943] by [@adler99]
26
+
27
+ ## 2.5.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.4.0..v2.5.0)
6
28
 
7
29
  ### Enhancements
8
30
 
9
- #### Minor
31
+ * Azerbaijani translation. [#5078] by [@orkhan]
32
+
33
+ ### Bug Fixes
34
+
35
+ * Convert namespace to sym to prevent duplicate namespaces such as :foo and 'foo'. [#5931] by [@westonganger]
36
+ * Use filter label when condition has a predicate. [#5886] by [@ko-lem]
37
+ * Fix error when routing with array containing symbol. [#5870] by [@jwesorick]
38
+ * Fix error when there is a model named `Tag` and `meta_tags` have been configured. [#5895] by [@micred], [@FabioRos] and [@deivid-rodriguez]
39
+ * Allow specifying custom `input_html` for `DateRangeInput`. [#5867] by [@mirelon]
40
+ * Adjust `#main_content` right margin to take into account possible custom values of `$sidebar-width` and `$section-padding`. [#5887] by [@guigs]
41
+ * Improved polymorphic routes generation to avoid problems when multiple `belongs_to` are defined. [#5938] by [@leio10]
42
+
43
+ ### Dependency Changes
44
+
45
+ * Support for Rails 5.0 and Rails 5.1 has been dropped. [#5877] by [@deivid-rodriguez]
46
+
47
+ ## 2.4.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.3.1..v2.4.0)
48
+
49
+ ### Enhancements
50
+
51
+ * Make optimization to not use expensive COUNT queries also work for decorated actions. [#5811] by [@irmela]
52
+ * Render a text filter instead of a select for large associations (opt-in). [#5548] by [@DanielHeath]
53
+ * Improve German translations. [#5874] by [@juril33t]
54
+
55
+ ## 2.3.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.3.0..v2.3.1)
56
+
57
+ ### Bug Fixes
58
+
59
+ * 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]
60
+
61
+ ## 2.3.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.2.0..v2.3.0)
62
+
63
+ ### Enhancements
10
64
 
11
65
  * Bump minimum ransack requirement to make sure everyone gets a version that works ok with all supported versions of Rails. [#5831] by [@deivid-rodriguez]
12
66
 
@@ -22,14 +76,12 @@
22
76
 
23
77
  ### Enhancements
24
78
 
25
- #### Minor
26
-
27
79
  * 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]
28
80
  * Add Macedonian locale. [#5710] by [@violeta-p]
29
81
 
30
82
  ### Bug Fixes
31
83
 
32
- * Fix pundit policy retrieving for static pages when the pundit namespace is :active_admin. [#5777] by [@kwent]
84
+ * Fix pundit policy retrieving for static pages when the pundit namespace is `:active_admin`. [#5777] by [@kwent]
33
85
  * Fix show page title not being properly escaped if title's content included HTML. [#5802] by [@deivid-rodriguez]
34
86
  * Revert [21b6138f] from [#5740] since it actually caused the performance in development to regress. [#5801] by [@deivid-rodriguez]
35
87
 
@@ -41,7 +93,7 @@
41
93
  * Crash when rendering comments from a custom controller block. [#5758] by [@deivid-rodriguez]
42
94
  * 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]
43
95
 
44
- ### Removals
96
+ ### Dependency Changes
45
97
 
46
98
  * Support for ruby 2.3 has been removed. [#5751] by [@deivid-rodriguez]
47
99
 
@@ -53,8 +105,6 @@ _No changes_.
53
105
 
54
106
  ### Enhancements
55
107
 
56
- #### Minor
57
-
58
108
  * Require arbre `~> 1.2, >= 1.2.1`. [#5726] by [@ionut998], and [#5738] by [@deivid-rodriguez]
59
109
 
60
110
  ## 2.0.0.rc1 [☰](https://github.com/activeadmin/activeadmin/compare/v1.4.3..v2.0.0.rc1)
@@ -70,9 +120,6 @@ _No changes_.
70
120
  ```
71
121
 
72
122
  * Consider authorization when displaying comments in show page. [#5555] by [@amiuhle]
73
-
74
- #### Minor
75
-
76
123
  * Add better support for rendering lists. [#5370] by [@dkniffin]
77
124
  * 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]
78
125
 
@@ -89,7 +136,7 @@ _No changes_.
89
136
  * Sidebar title internationalization. [#5417] by [@WaKeMaTTa]
90
137
  * `filter` labels not allowing a `Proc` to be passed. [#5418] by [@WaKeMaTTa]
91
138
 
92
- ### Removals
139
+ ### Dependency Changes
93
140
 
94
141
  * Rails 4.2 support has been dropped. [#5104] by [@javierjulio] and [@deivid-rodriguez]
95
142
  * Dependency on coffee-rails has been removed. [#5081] by [@javierjulio]
@@ -125,8 +172,6 @@ _No changes_.
125
172
 
126
173
  ### Enhancements
127
174
 
128
- #### Minor
129
-
130
175
  * Add missing I18n for comments. [#5458], [#5461] by [@mauriciopasquier]
131
176
  * Fix batch_actions.delete_confirmation translation in zh-CN.yml. [#5453] by [@ShallmentMo]
132
177
  * Add some missing italian translations. [#5433] by [@stefsava]
@@ -164,8 +209,6 @@ _No changes_.
164
209
 
165
210
  ### Enhancements
166
211
 
167
- #### Major
168
-
169
212
  * Rails 5.2 support [#5343] by [@varyonic], [#5399], [#5401] by [@zorab47]
170
213
 
171
214
  ## 1.2.1 [☰](https://github.com/activeadmin/activeadmin/compare/v1.2.0..v1.2.1)
@@ -178,8 +221,6 @@ _No changes_.
178
221
 
179
222
  ### Enhancements
180
223
 
181
- #### Minor
182
-
183
224
  * Do not display pagination info when there are no comments. [#5119] by [@alex-bogomolov]
184
225
  * Revert generated config files to pluralized. [#5120] by [@varyonic], [#5137] by [@deivid-rodriguez]
185
226
  * Warn when action definition overwrites controller method. [#5167] by [@aarek]
@@ -210,7 +251,7 @@ _No changes_.
210
251
  * Fixed [#5043]. Do not crash in sidebar rendering when a default scope is not specified. [#5044] by [@Fivell]
211
252
  * Fixed [#3894]. Make tab's component work with non-ascii titles. [#5046] by [@Fivell]
212
253
 
213
- ### Removals
254
+ ### Dependency Changes
214
255
 
215
256
  * Ruby 2.1 support has been dropped. [#5003] by [@deivid-rodriguez]
216
257
  * Replaced `sass-rails` with `sass` dependency. [#5037] by [@javierjulio]
@@ -248,8 +289,6 @@ _No changes_.
248
289
 
249
290
  ### Enhancements
250
291
 
251
- #### Minor
252
-
253
292
  * Support proc as an input_html option value when declaring filters. [#5029] by [@Fivell]
254
293
  * Base localization support, better associations handling for active filters sidebar. [#4951] by [@Fivell]
255
294
  * Allow AA scopes to return paginated collections. [#4996] by [@Fivell]
@@ -273,16 +312,11 @@ _No changes_.
273
312
 
274
313
  ### Enhancements
275
314
 
276
- #### Major
277
-
278
315
  * Migration from Metasearch to Ransack. [#1979] by [@seanlinsley]
279
316
  * Rails 4 support. [#2326] by many people :heart:
280
317
  * Rails 4.2 support. [#3731] by [@gonzedge] and [@timoschilling]
281
318
  * Rails 5 support. [#4254] by [@seanlinsley]
282
319
  * Rails 5.1 support. [#4882] by [@varyonic]
283
-
284
- #### Minor
285
-
286
320
  * "Create another" checkbox for the new resource page. [#4477] by [@bolshakov]
287
321
  * Page supports belongs_to. [#4759] by [@Fivell] and [@zorab47]
288
322
  * Support for custom sorting strategies. [#4768] by [@Fivell]
@@ -413,6 +447,7 @@ Please check [0-6-stable] for previous changes.
413
447
  [#5052]: https://github.com/activeadmin/activeadmin/pull/5052
414
448
  [#5060]: https://github.com/activeadmin/activeadmin/pull/5060
415
449
  [#5069]: https://github.com/activeadmin/activeadmin/pull/5069
450
+ [#5078]: https://github.com/activeadmin/activeadmin/pull/5078
416
451
  [#5081]: https://github.com/activeadmin/activeadmin/pull/5081
417
452
  [#5088]: https://github.com/activeadmin/activeadmin/pull/5088
418
453
  [#5093]: https://github.com/activeadmin/activeadmin/pull/5093
@@ -493,24 +528,49 @@ Please check [0-6-stable] for previous changes.
493
528
  [#5800]: https://github.com/activeadmin/activeadmin/pull/5800
494
529
  [#5801]: https://github.com/activeadmin/activeadmin/pull/5801
495
530
  [#5802]: https://github.com/activeadmin/activeadmin/pull/5802
531
+ [#5811]: https://github.com/activeadmin/activeadmin/pull/5811
496
532
  [#5816]: https://github.com/activeadmin/activeadmin/pull/5816
497
533
  [#5822]: https://github.com/activeadmin/activeadmin/pull/5822
498
534
  [#5826]: https://github.com/activeadmin/activeadmin/pull/5826
499
535
  [#5831]: https://github.com/activeadmin/activeadmin/pull/5831
536
+ [#5548]: https://github.com/activeadmin/activeadmin/pull/5548
500
537
  [#5842]: https://github.com/activeadmin/activeadmin/pull/5842
538
+ [#5854]: https://github.com/activeadmin/activeadmin/pull/5854
539
+ [#5874]: https://github.com/activeadmin/activeadmin/pull/5874
540
+ [#5877]: https://github.com/activeadmin/activeadmin/pull/5877
541
+ [#5886]: https://github.com/activeadmin/activeadmin/pull/5886
542
+ [#5870]: https://github.com/activeadmin/activeadmin/pull/5870
543
+ [#5894]: https://github.com/activeadmin/activeadmin/pull/5894
544
+ [#5895]: https://github.com/activeadmin/activeadmin/pull/5895
545
+ [#5867]: https://github.com/activeadmin/activeadmin/pull/5867
546
+ [#5887]: https://github.com/activeadmin/activeadmin/pull/5887
547
+ [#5931]: https://github.com/activeadmin/activeadmin/pull/5931
548
+ [#5938]: https://github.com/activeadmin/activeadmin/pull/5938
549
+ [#5929]: https://github.com/activeadmin/activeadmin/pull/5929
550
+ [#5943]: https://github.com/activeadmin/activeadmin/pull/5943
551
+ [#5946]: https://github.com/activeadmin/activeadmin/pull/5946
552
+ [#5956]: https://github.com/activeadmin/activeadmin/pull/5956
553
+ [#5957]: https://github.com/activeadmin/activeadmin/pull/5957
554
+ [#6000]: https://github.com/activeadmin/activeadmin/pull/6000
555
+ [#6002]: https://github.com/activeadmin/activeadmin/pull/6002
556
+ [#6047]: https://github.com/activeadmin/activeadmin/pull/6047
501
557
 
502
558
  [@5t111111]: https://github.com/5t111111
503
559
  [@aarek]: https://github.com/aarek
560
+ [@adler99]: https://github.com/adler99
504
561
  [@ajw725]: https://github.com/ajw725
505
562
  [@alex-bogomolov]: https://github.com/alex-bogomolov
506
563
  [@amiel]: https://github.com/amiel
507
564
  [@amiuhle]: https://github.com/amiuhle
508
565
  [@andreslemik]: https://github.com/andreslemik
566
+ [@bartoszkopinski]: https://github.com/bartoszkopinski
509
567
  [@blocknotes]: https://github.com/blocknotes
510
568
  [@bolshakov]: https://github.com/bolshakov
511
569
  [@buren]: https://github.com/buren
512
570
  [@chancancode]: https://github.com/chancancode
571
+ [@chrp]: https://github.com/chrp
513
572
  [@chumakoff]: https://github.com/chumakoff
573
+ [@cprodhomme]: https://github.com/cprodhomme
514
574
  [@craigmcnamara]: https://github.com/craigmcnamara
515
575
  [@DanielHeath]: https://github.com/DanielHeath
516
576
  [@deivid-rodriguez]: https://github.com/deivid-rodriguez
@@ -521,26 +581,40 @@ Please check [0-6-stable] for previous changes.
521
581
  [@drn]: https://github.com/drn
522
582
  [@eikes]: https://github.com/eikes
523
583
  [@f1sherman]: https://github.com/f1sherman
584
+ [@FabioRos]: https://github.com/FabioRos
524
585
  [@faucct]: https://github.com/faucct
525
586
  [@Fivell]: https://github.com/Fivell
526
587
  [@glebtv]: https://github.com/glebtv
527
588
  [@gonzedge]: https://github.com/gonzedge
589
+ [@guigs]: https://github.com/guigs
528
590
  [@HappyKadaver]: https://github.com/HappyKadaver
591
+ [@imcvampire]: https://github.com/imcvampire
529
592
  [@innparusu95]: https://github.com/innparusu95
530
593
  [@ionut998]: https://github.com/ionut998
594
+ [@irmela]: https://github.com/irmela
531
595
  [@jasl]: https://github.com/jasl
532
596
  [@javierjulio]: https://github.com/javierjulio
533
597
  [@jawa]: https://github.com/jawa
534
598
  [@JiiHu]: https://github.com/JiiHu
535
599
  [@johnnyshields]: https://github.com/johnnyshields
600
+ [@jscheid]: https://github.com/jscheid
601
+ [@juril33t]: https://github.com/juril33t
602
+ [@jwesorick]: https://github.com/jwesorick
536
603
  [@kjeldahl]: https://github.com/kjeldahl
604
+ [@ko-lem]: https://github.com/ko-lem
537
605
  [@kobeumut]: https://github.com/kobeumut
606
+ [@Kris-LIBIS]: https://github.com/Kris-LIBIS
538
607
  [@kwent]: https://github.com/kwent
539
608
  [@leio10]: https://github.com/leio10
540
609
  [@markstory]: https://github.com/markstory
541
610
  [@mauriciopasquier]: https://github.com/mauriciopasquier
542
611
  [@mconiglio]: https://github.com/mconiglio
612
+ [@micred]: https://github.com/micred
613
+ [@mirelon]: https://github.com/mirelon
614
+ [@ndbroadbent]: https://github.com/ndbroadbent
543
615
  [@Nguyenanh]: https://github.com/Nguyenanh
616
+ [@orkhan]: https://github.com/orkhan
617
+ [@panasyuk]: https://github.com/panasyuk
544
618
  [@PChambino]: https://github.com/PChambino
545
619
  [@potatosalad]: https://github.com/potatosalad
546
620
  [@pranas]: https://github.com/pranas
@@ -548,6 +622,7 @@ Please check [0-6-stable] for previous changes.
548
622
  [@RobinvanderVliet]: https://github.com/RobinvanderVliet
549
623
  [@rogerkk]: https://github.com/rogerkk
550
624
  [@seanlinsley]: https://github.com/seanlinsley
625
+ [@sgara]: https://github.com/sgara
551
626
  [@ShallmentMo]: https://github.com/ShallmentMo
552
627
  [@shekibobo]: https://github.com/shekibobo
553
628
  [@shouya]: https://github.com/shouya
@@ -557,16 +632,12 @@ Please check [0-6-stable] for previous changes.
557
632
  [@timoschilling]: https://github.com/timoschilling
558
633
  [@TimPetricola]: https://github.com/TimPetricola
559
634
  [@varyonic]: https://github.com/varyonic
560
- [@wasifhossain]: https://github.com/wasifhossain
635
+ [@vcsjones]: https://github.com/vcsjones
636
+ [@vfonic]: https://github.com/vfonic
637
+ [@violeta-p]: https://github.com/violeta-p
561
638
  [@WaKeMaTTa]: https://github.com/WaKeMaTTa
639
+ [@wasifhossain]: https://github.com/wasifhossain
640
+ [@westonganger]: https://github.com/westonganger
562
641
  [@Wowu]: https://github.com/Wowu
563
642
  [@wspurgin]: https://github.com/wspurgin
564
643
  [@zorab47]: https://github.com/zorab47
565
- [@chrp]: https://github.com/chrp
566
- [@bartoszkopinski]: https://github.com/bartoszkopinski
567
- [@panasyuk]: https://github.com/panasyuk
568
- [@jscheid]: https://github.com/jscheid
569
- [@violeta-p]: https://github.com/violeta-p
570
- [@ndbroadbent]: https://github.com/ndbroadbent
571
- [@Kris-LIBIS]: https://github.com/Kris-LIBIS
572
- [@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
207
  [interactive rebase]: https://help.github.com/articles/interactive-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/