activeadmin 2.4.0 → 2.9.0

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

Potentially problematic release.


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

Files changed (183) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +192 -30
  3. data/CONTRIBUTING.md +42 -62
  4. data/README.md +4 -4
  5. data/app/assets/javascripts/active_admin/base.js +517 -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/app/assets/stylesheets/active_admin/components/_comments.scss +2 -2
  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/lib/batch_actions.es6 → javascript/active_admin/initializers/batch-actions.js} +4 -2
  17. data/app/javascript/active_admin/initializers/checkbox-toggler.js +3 -0
  18. data/app/javascript/active_admin/initializers/dropdown-menu.js +9 -0
  19. data/app/javascript/active_admin/initializers/filters.js +10 -0
  20. data/app/javascript/active_admin/initializers/per-page.js +13 -0
  21. data/app/javascript/active_admin/initializers/table-checkbox-toggler.js +3 -0
  22. data/app/{assets/javascripts/active_admin/lib/checkbox-toggler.es6 → javascript/active_admin/lib/checkbox-toggler.js} +5 -5
  23. data/app/{assets/javascripts/active_admin/lib/dropdown-menu.es6 → javascript/active_admin/lib/dropdown-menu.js} +3 -10
  24. data/app/javascript/active_admin/lib/filters.js +39 -0
  25. data/app/{assets/javascripts/active_admin/lib/modal_dialog.es6 → javascript/active_admin/lib/modal-dialog.js} +10 -8
  26. data/app/javascript/active_admin/lib/per-page.js +38 -0
  27. data/app/{assets/javascripts/active_admin/lib/table-checkbox-toggler.es6 → javascript/active_admin/lib/table-checkbox-toggler.js} +5 -3
  28. data/app/javascript/active_admin/lib/utils.js +40 -0
  29. data/app/views/active_admin/devise/mailer/reset_password_instructions.html.erb +1 -1
  30. data/app/views/active_admin/devise/mailer/unlock_instructions.html.erb +2 -2
  31. data/app/views/layouts/active_admin_logged_out.html.erb +15 -5
  32. data/config/locales/ar.yml +6 -6
  33. data/config/locales/az.yml +138 -0
  34. data/config/locales/en-CA.yml +3 -3
  35. data/config/locales/en-GB.yml +3 -3
  36. data/config/locales/en.yml +3 -3
  37. data/config/locales/es-MX.yml +2 -1
  38. data/config/locales/es.yml +5 -5
  39. data/config/locales/fr.yml +4 -4
  40. data/config/locales/it.yml +18 -0
  41. data/config/locales/ja.yml +3 -3
  42. data/config/locales/lv.yml +2 -2
  43. data/config/locales/vi.yml +6 -5
  44. data/docs/0-installation.md +26 -2
  45. data/docs/1-general-configuration.md +20 -0
  46. data/docs/11-decorators.md +16 -5
  47. data/docs/2-resource-customization.md +10 -1
  48. data/docs/3-index-pages.md +1 -1
  49. data/docs/5-forms.md +6 -1
  50. data/docs/6-show-pages.md +12 -0
  51. data/docs/9-batch-actions.md +2 -2
  52. data/docs/Gemfile +2 -2
  53. data/docs/Gemfile.lock +124 -113
  54. data/docs/_includes/top-menu.html +1 -1
  55. data/docs/documentation.md +1 -1
  56. data/docs/index.html +6 -6
  57. data/lib/active_admin/application.rb +14 -14
  58. data/lib/active_admin/application_settings.rb +3 -3
  59. data/lib/active_admin/authorization_adapter.rb +3 -3
  60. data/lib/active_admin/base_controller/authorization.rb +13 -12
  61. data/lib/active_admin/base_controller.rb +4 -4
  62. data/lib/active_admin/batch_actions/controller.rb +3 -3
  63. data/lib/active_admin/batch_actions/resource_extension.rb +9 -8
  64. data/lib/active_admin/batch_actions/views/batch_action_form.rb +3 -3
  65. data/lib/active_admin/batch_actions/views/batch_action_selector.rb +6 -6
  66. data/lib/active_admin/batch_actions/views/selection_cells.rb +3 -3
  67. data/lib/active_admin/cancan_adapter.rb +1 -1
  68. data/lib/active_admin/collection_decorator.rb +31 -0
  69. data/lib/active_admin/csv_builder.rb +11 -7
  70. data/lib/active_admin/dependency.rb +11 -11
  71. data/lib/active_admin/devise.rb +5 -5
  72. data/lib/active_admin/dsl.rb +1 -1
  73. data/lib/active_admin/dynamic_settings_node.rb +2 -2
  74. data/lib/active_admin/engine.rb +10 -8
  75. data/lib/active_admin/error.rb +0 -2
  76. data/lib/active_admin/filters/active.rb +1 -1
  77. data/lib/active_admin/filters/active_filter.rb +6 -7
  78. data/lib/active_admin/filters/active_sidebar.rb +5 -5
  79. data/lib/active_admin/filters/forms.rb +6 -6
  80. data/lib/active_admin/filters/formtastic_addons.rb +1 -6
  81. data/lib/active_admin/filters/resource_extension.rb +1 -1
  82. data/lib/active_admin/filters.rb +7 -7
  83. data/lib/active_admin/form_builder.rb +24 -20
  84. data/lib/active_admin/generators/boilerplate.rb +1 -1
  85. data/lib/active_admin/helpers/optional_display.rb +2 -2
  86. data/lib/active_admin/inputs/datepicker_input.rb +1 -1
  87. data/lib/active_admin/inputs/filters/base/search_method_select.rb +4 -4
  88. data/lib/active_admin/inputs/filters/base.rb +1 -1
  89. data/lib/active_admin/inputs/filters/boolean_input.rb +1 -1
  90. data/lib/active_admin/inputs/filters/check_boxes_input.rb +1 -1
  91. data/lib/active_admin/inputs/filters/date_range_input.rb +15 -12
  92. data/lib/active_admin/inputs/filters/select_input.rb +2 -2
  93. data/lib/active_admin/localizers/resource_localizer.rb +3 -3
  94. data/lib/active_admin/localizers.rb +1 -1
  95. data/lib/active_admin/menu.rb +6 -3
  96. data/lib/active_admin/menu_item.rb +7 -7
  97. data/lib/active_admin/namespace.rb +12 -12
  98. data/lib/active_admin/namespace_settings.rb +8 -5
  99. data/lib/active_admin/order_clause.rb +1 -1
  100. data/lib/active_admin/orm/active_record/comments/comment.rb +3 -3
  101. data/lib/active_admin/orm/active_record/comments/views/active_admin_comments.rb +19 -19
  102. data/lib/active_admin/orm/active_record/comments/views.rb +2 -2
  103. data/lib/active_admin/orm/active_record/comments.rb +19 -19
  104. data/lib/active_admin/orm/active_record.rb +1 -1
  105. data/lib/active_admin/page.rb +1 -1
  106. data/lib/active_admin/pundit_adapter.rb +5 -5
  107. data/lib/active_admin/resource/action_items.rb +5 -5
  108. data/lib/active_admin/resource/attributes.rb +1 -1
  109. data/lib/active_admin/resource/belongs_to.rb +2 -2
  110. data/lib/active_admin/resource/controllers.rb +1 -1
  111. data/lib/active_admin/resource/menu.rb +4 -4
  112. data/lib/active_admin/resource/naming.rb +5 -5
  113. data/lib/active_admin/resource/routes.rb +5 -7
  114. data/lib/active_admin/resource/scope_to.rb +7 -7
  115. data/lib/active_admin/resource/sidebars.rb +1 -1
  116. data/lib/active_admin/resource.rb +18 -18
  117. data/lib/active_admin/resource_controller/data_access.rb +1 -1
  118. data/lib/active_admin/resource_controller/decorators.rb +6 -28
  119. data/lib/active_admin/resource_controller/polymorphic_routes.rb +3 -2
  120. data/lib/active_admin/resource_controller/streaming.rb +7 -6
  121. data/lib/active_admin/resource_controller.rb +12 -11
  122. data/lib/active_admin/resource_dsl.rb +5 -5
  123. data/lib/active_admin/scope.rb +6 -6
  124. data/lib/active_admin/version.rb +1 -1
  125. data/lib/active_admin/view_factory.rb +17 -17
  126. data/lib/active_admin/view_helpers/breadcrumb_helper.rb +3 -3
  127. data/lib/active_admin/view_helpers/display_helper.rb +5 -5
  128. data/lib/active_admin/view_helpers/download_format_links_helper.rb +1 -1
  129. data/lib/active_admin/view_helpers/fields_for.rb +2 -2
  130. data/lib/active_admin/view_helpers.rb +1 -1
  131. data/lib/active_admin/views/components/active_admin_form.rb +5 -5
  132. data/lib/active_admin/views/components/attributes_table.rb +5 -5
  133. data/lib/active_admin/views/components/blank_slate.rb +1 -1
  134. data/lib/active_admin/views/components/dropdown_menu.rb +8 -8
  135. data/lib/active_admin/views/components/index_list.rb +3 -3
  136. data/lib/active_admin/views/components/menu.rb +1 -1
  137. data/lib/active_admin/views/components/menu_item.rb +4 -4
  138. data/lib/active_admin/views/components/paginated_collection.rb +19 -18
  139. data/lib/active_admin/views/components/panel.rb +1 -1
  140. data/lib/active_admin/views/components/scopes.rb +7 -5
  141. data/lib/active_admin/views/components/site_title.rb +1 -1
  142. data/lib/active_admin/views/components/status_tag.rb +11 -11
  143. data/lib/active_admin/views/components/table_for.rb +18 -17
  144. data/lib/active_admin/views/components/tabs.rb +3 -3
  145. data/lib/active_admin/views/footer.rb +2 -1
  146. data/lib/active_admin/views/header.rb +2 -2
  147. data/lib/active_admin/views/index_as_blog.rb +1 -1
  148. data/lib/active_admin/views/index_as_grid.rb +1 -1
  149. data/lib/active_admin/views/index_as_table.rb +16 -16
  150. data/lib/active_admin/views/pages/base.rb +15 -11
  151. data/lib/active_admin/views/pages/index.rb +15 -13
  152. data/lib/active_admin/views/tabbed_navigation.rb +2 -2
  153. data/lib/active_admin/views/title_bar.rb +1 -1
  154. data/lib/active_admin/views.rb +1 -1
  155. data/lib/active_admin.rb +61 -63
  156. data/lib/activeadmin.rb +1 -1
  157. data/lib/generators/active_admin/assets/assets_generator.rb +2 -2
  158. data/lib/generators/active_admin/assets/templates/active_admin.scss +2 -2
  159. data/lib/generators/active_admin/devise/devise_generator.rb +5 -5
  160. data/lib/generators/active_admin/install/install_generator.rb +14 -8
  161. data/lib/generators/active_admin/install/templates/active_admin.rb.erb +9 -2
  162. data/lib/generators/active_admin/page/page_generator.rb +1 -1
  163. data/lib/generators/active_admin/resource/resource_generator.rb +3 -3
  164. data/lib/generators/active_admin/webpacker/plugins/jquery.js +7 -0
  165. data/lib/generators/active_admin/webpacker/templates/active_admin.js +5 -0
  166. data/lib/generators/active_admin/webpacker/templates/active_admin.scss +17 -0
  167. data/lib/generators/active_admin/webpacker/templates/print.scss +2 -0
  168. data/lib/generators/active_admin/webpacker/webpacker_generator.rb +26 -0
  169. data/lib/ransack_ext.rb +8 -8
  170. metadata +46 -84
  171. data/app/assets/images/active_admin/nested_menu_arrow.gif +0 -0
  172. data/app/assets/images/active_admin/nested_menu_arrow_dark.gif +0 -0
  173. data/app/assets/images/active_admin/orderable.png +0 -0
  174. data/app/assets/javascripts/active_admin/base.es6 +0 -23
  175. data/app/assets/javascripts/active_admin/initializers/filters.es6 +0 -45
  176. data/app/assets/javascripts/active_admin/lib/active_admin.es6 +0 -41
  177. data/app/assets/javascripts/active_admin/lib/per_page.es6 +0 -47
  178. /data/{vendor → app}/assets/stylesheets/active_admin/_normalize.scss +0 -0
  179. /data/app/{assets/javascripts/active_admin/ext/jquery-ui.es6 → javascript/active_admin/ext/jquery-ui.js} +0 -0
  180. /data/app/{assets/javascripts/active_admin/ext/jquery.es6 → javascript/active_admin/ext/jquery.js} +0 -0
  181. /data/app/{assets/javascripts/active_admin/initializers/datepicker.es6 → javascript/active_admin/initializers/datepicker.js} +0 -0
  182. /data/app/{assets/javascripts/active_admin/lib/has_many.es6 → javascript/active_admin/initializers/has-many.js} +0 -0
  183. /data/app/{assets/javascripts/active_admin/initializers/tabs.es6 → javascript/active_admin/initializers/tabs.js} +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ddd5ccf937ae176b3ba0e13d2af256758dbde0c4aafe9b966c752bb1bb411ea8
4
- data.tar.gz: fa4bbd86cf444fb150d6cd624ed8a3125144481878001de32461f5256e30b835
3
+ metadata.gz: 3a79fadc45ea60de060d130d9ce18ca04b0becd14baae2e46b3749b76cb7bd20
4
+ data.tar.gz: 59ecfb3dba085bd66b2534991dcba8e14dae2f76a07baae37f8b8daaa4063917
5
5
  SHA512:
6
- metadata.gz: 84c708ca4b0aa8580a3181de153dd698f39c427e9c28adca8c7b3d1f75ff09ba41fa9955d84c6eeb3beccd174db2147a54980123302093cb0d51dd22a021ff40
7
- data.tar.gz: 95fc6f7f92134b18270a2ccfdb05c1c55e9151bde9390bbd752f3735633f494c4145674534c1f2bc964687dc513aeb925a5427c8678ea3380340b89859431ebe
6
+ metadata.gz: 2d26b7fb0ffbd1da98ca7b4f685a7c386dcab3f25079f5e16e7926cb1c9ce2060db7ecc27d158608091a178590c9604b33850d5f44009401bee467c6f84811a0
7
+ data.tar.gz: 1273181e98620f7af30434e4fb669d95eddfa7633d3e5fb5b51fbb31bf8d8b7615e07c413590cba13b86b5fc1e087dc589f7f4f227c6ff62c4ea25925faf07f8
data/CHANGELOG.md CHANGED
@@ -2,13 +2,125 @@
2
2
 
3
3
  ## Unreleased
4
4
 
5
+ ## 2.9.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.8.1..v2.9.0)
6
+
7
+ ### Enhancements
8
+
9
+ * Support for Rails 6.1. [#6548] by [@deivid-rodriguez]
10
+ * Add ability to override "Remove" button text on has_many forms. [#6523] by [@littleforest]
11
+ * Drop git in gemspec. [#6462] by [@utkarsh2102]
12
+
13
+ ### Bug Fixes
14
+
15
+ * Pick up upstream fixes in devise templates. [#6536] by [@munen]
16
+
17
+ ### Documentation
18
+
19
+ * Fix `has_many` syntax in forms documentation. [#6583] by [@krzcho]
20
+ * Add example of using `default_main_content` in show pages. [#6487] by [@sjieg]
21
+
22
+ ### Dependency Changes
23
+
24
+ * Remove sassc and sprockets runtime dependencies. [#6584] by [@deivid-rodriguez]
25
+
26
+ ## 2.8.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.8.0..v2.8.1)
27
+
28
+ ### Bug Fixes
29
+
30
+ * Fix `permitted_param` generation for `belongs_to` when `:param` is used. [#6460] by [@deivid-rodriguez]
31
+ * Fix streaming CSV export. [#6451] by [@deivid-rodriguez]
32
+ * Fix input string filter no rendering dropdown input when its column name ends with a ransack predicate. [#6422] by [@Fivell]
33
+
34
+ ## 2.8.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.7.0..v2.8.0)
35
+
36
+ ### Enhancements
37
+
38
+ * Allow using PORO decorators. [#6249] by [@brunvez]
39
+ * Make sure `ActiveAdmin.routes` provides routes in a consistent order. [#6124] by [@jiikko]
40
+ * Use proper closing tags for HTML in ModalDialog component. [#6221] by [@javierjulio]
41
+
42
+ ### Bug Fixes
43
+
44
+ * Fix comment layout so regardless of size, each is aligned and spaced evenly. [#6393] by [@Ivanov-Anton]
45
+
46
+ ### Translation Improvements
47
+
48
+ * Fix several Arabic translations. [#6368] by [@mshalaby]
49
+ * Add missing `scope/all` italian translation. [#6341] by [@fuzziness]
50
+ * Improve Japanese translation. [#6315] by [@rn0rno]
51
+ * Fix es and es-MX sign_in and sign_up translation. [#6210] by [@roramirez]
52
+
53
+ ### Documentation
54
+
55
+ * Fix filter_columns_for_large_association and filter_method_for_large_association examples. [#6232] by [@ndbroadbent]
56
+
57
+ ### Dependency Changes
58
+
59
+ * Allow formtastic 4. [#6318] by [@deivid-rodriguez]
60
+ * Drop Ruby 2.4 support. [#6198] by [@deivid-rodriguez]
61
+
62
+ ## 2.7.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.6.1..v2.7.0)
63
+
64
+ ### Enhancements
65
+
66
+ * Extend menu to allow for nested submenus. [#5994] by [@taralbass]
67
+ * Add Webpacker compatibility with opt-in config switch and installation generator. [#5855] by [@sgara]
68
+
69
+ ### Bug Fixes
70
+
71
+ * Fix scopes renderer when resource has only optional scopes and their conditions are false. [#6149] by [@Looooong]
72
+ * Fix some missing wrapper markup in "logged out" layout. [#6086] by [@irmela]
73
+ * Fix some typos in Vietnamese translation. [#6099] by [@giapnhdev]
74
+
75
+ ## 2.6.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.6.0..v2.6.1)
76
+
77
+ ### Bug Fixes
78
+
79
+ * Fix some ruby 2.7 warnings about keyword args. [#6000] by [@vcsjones]
80
+ * Missing `create_another` translation in Vietnamese. [#6002] by [@imcvampire]
81
+ * Using "destroy" for user facing message is too robotic, prefer "delete". [#6047] by [@vfonic]
82
+ * Typo in confirmation message for comment deletion. [#6047] by [@vfonic]
83
+
84
+ ## 2.6.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.5.0..v2.6.0)
85
+
86
+ ### Enhancements
87
+
88
+ * Display multiple flash messages in separate elements. [#5929] by [@mirelon]
89
+ * Make delete confirmation messages in French & Spanish gender-neutral. [#5946] by [@cprodhomme]
90
+
91
+ ### Bug Fixes
92
+
93
+ * Export ModalDialog component to re-enable client side usage. [#5956] by [@sgara]
94
+ * Use default ActionView options instead of default Formtastic options for DateRangeInput [#5957] by [@mirelon]
95
+ * Fix i18n key in docs example to translate scopes. [#5943] by [@adler99]
96
+
97
+ ## 2.5.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.4.0..v2.5.0)
98
+
99
+ ### Enhancements
100
+
101
+ * Azerbaijani translation. [#5078] by [@orkhan]
102
+
103
+ ### Bug Fixes
104
+
105
+ * Convert namespace to sym to prevent duplicate namespaces such as :foo and 'foo'. [#5931] by [@westonganger]
106
+ * Use filter label when condition has a predicate. [#5886] by [@ko-lem]
107
+ * Fix error when routing with array containing symbol. [#5870] by [@jwesorick]
108
+ * Fix error when there is a model named `Tag` and `meta_tags` have been configured. [#5895] by [@micred], [@FabioRos] and [@deivid-rodriguez]
109
+ * Allow specifying custom `input_html` for `DateRangeInput`. [#5867] by [@mirelon]
110
+ * Adjust `#main_content` right margin to take into account possible custom values of `$sidebar-width` and `$section-padding`. [#5887] by [@guigs]
111
+ * Improved polymorphic routes generation to avoid problems when multiple `belongs_to` are defined. [#5938] by [@leio10]
112
+
113
+ ### Dependency Changes
114
+
115
+ * Support for Rails 5.0 and Rails 5.1 has been dropped. [#5877] by [@deivid-rodriguez]
116
+
5
117
  ## 2.4.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.3.1..v2.4.0)
6
118
 
7
119
  ### Enhancements
8
120
 
9
121
  * Make optimization to not use expensive COUNT queries also work for decorated actions. [#5811] by [@irmela]
10
- * Render a text filter instead of a select for large associations (opt-in) [#5548] by [@DanielHeath]
11
- * Improve German translations [#5874] by [@juril33t]
122
+ * Render a text filter instead of a select for large associations (opt-in). [#5548] by [@DanielHeath]
123
+ * Improve German translations. [#5874] by [@juril33t]
12
124
 
13
125
  ## 2.3.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.3.0..v2.3.1)
14
126
 
@@ -20,8 +132,6 @@
20
132
 
21
133
  ### Enhancements
22
134
 
23
- #### Minor
24
-
25
135
  * Bump minimum ransack requirement to make sure everyone gets a version that works ok with all supported versions of Rails. [#5831] by [@deivid-rodriguez]
26
136
 
27
137
  ### Bug Fixes
@@ -36,14 +146,12 @@
36
146
 
37
147
  ### Enhancements
38
148
 
39
- #### Minor
40
-
41
149
  * 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]
42
150
  * Add Macedonian locale. [#5710] by [@violeta-p]
43
151
 
44
152
  ### Bug Fixes
45
153
 
46
- * Fix pundit policy retrieving for static pages when the pundit namespace is :active_admin. [#5777] by [@kwent]
154
+ * Fix pundit policy retrieving for static pages when the pundit namespace is `:active_admin`. [#5777] by [@kwent]
47
155
  * Fix show page title not being properly escaped if title's content included HTML. [#5802] by [@deivid-rodriguez]
48
156
  * Revert [21b6138f] from [#5740] since it actually caused the performance in development to regress. [#5801] by [@deivid-rodriguez]
49
157
 
@@ -55,7 +163,7 @@
55
163
  * Crash when rendering comments from a custom controller block. [#5758] by [@deivid-rodriguez]
56
164
  * 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]
57
165
 
58
- ### Removals
166
+ ### Dependency Changes
59
167
 
60
168
  * Support for ruby 2.3 has been removed. [#5751] by [@deivid-rodriguez]
61
169
 
@@ -67,8 +175,6 @@ _No changes_.
67
175
 
68
176
  ### Enhancements
69
177
 
70
- #### Minor
71
-
72
178
  * Require arbre `~> 1.2, >= 1.2.1`. [#5726] by [@ionut998], and [#5738] by [@deivid-rodriguez]
73
179
 
74
180
  ## 2.0.0.rc1 [☰](https://github.com/activeadmin/activeadmin/compare/v1.4.3..v2.0.0.rc1)
@@ -84,9 +190,6 @@ _No changes_.
84
190
  ```
85
191
 
86
192
  * Consider authorization when displaying comments in show page. [#5555] by [@amiuhle]
87
-
88
- #### Minor
89
-
90
193
  * Add better support for rendering lists. [#5370] by [@dkniffin]
91
194
  * 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]
92
195
 
@@ -103,7 +206,7 @@ _No changes_.
103
206
  * Sidebar title internationalization. [#5417] by [@WaKeMaTTa]
104
207
  * `filter` labels not allowing a `Proc` to be passed. [#5418] by [@WaKeMaTTa]
105
208
 
106
- ### Removals
209
+ ### Dependency Changes
107
210
 
108
211
  * Rails 4.2 support has been dropped. [#5104] by [@javierjulio] and [@deivid-rodriguez]
109
212
  * Dependency on coffee-rails has been removed. [#5081] by [@javierjulio]
@@ -139,8 +242,6 @@ _No changes_.
139
242
 
140
243
  ### Enhancements
141
244
 
142
- #### Minor
143
-
144
245
  * Add missing I18n for comments. [#5458], [#5461] by [@mauriciopasquier]
145
246
  * Fix batch_actions.delete_confirmation translation in zh-CN.yml. [#5453] by [@ShallmentMo]
146
247
  * Add some missing italian translations. [#5433] by [@stefsava]
@@ -178,8 +279,6 @@ _No changes_.
178
279
 
179
280
  ### Enhancements
180
281
 
181
- #### Major
182
-
183
282
  * Rails 5.2 support [#5343] by [@varyonic], [#5399], [#5401] by [@zorab47]
184
283
 
185
284
  ## 1.2.1 [☰](https://github.com/activeadmin/activeadmin/compare/v1.2.0..v1.2.1)
@@ -192,8 +291,6 @@ _No changes_.
192
291
 
193
292
  ### Enhancements
194
293
 
195
- #### Minor
196
-
197
294
  * Do not display pagination info when there are no comments. [#5119] by [@alex-bogomolov]
198
295
  * Revert generated config files to pluralized. [#5120] by [@varyonic], [#5137] by [@deivid-rodriguez]
199
296
  * Warn when action definition overwrites controller method. [#5167] by [@aarek]
@@ -224,7 +321,7 @@ _No changes_.
224
321
  * Fixed [#5043]. Do not crash in sidebar rendering when a default scope is not specified. [#5044] by [@Fivell]
225
322
  * Fixed [#3894]. Make tab's component work with non-ascii titles. [#5046] by [@Fivell]
226
323
 
227
- ### Removals
324
+ ### Dependency Changes
228
325
 
229
326
  * Ruby 2.1 support has been dropped. [#5003] by [@deivid-rodriguez]
230
327
  * Replaced `sass-rails` with `sass` dependency. [#5037] by [@javierjulio]
@@ -262,8 +359,6 @@ _No changes_.
262
359
 
263
360
  ### Enhancements
264
361
 
265
- #### Minor
266
-
267
362
  * Support proc as an input_html option value when declaring filters. [#5029] by [@Fivell]
268
363
  * Base localization support, better associations handling for active filters sidebar. [#4951] by [@Fivell]
269
364
  * Allow AA scopes to return paginated collections. [#4996] by [@Fivell]
@@ -287,16 +382,11 @@ _No changes_.
287
382
 
288
383
  ### Enhancements
289
384
 
290
- #### Major
291
-
292
385
  * Migration from Metasearch to Ransack. [#1979] by [@seanlinsley]
293
386
  * Rails 4 support. [#2326] by many people :heart:
294
387
  * Rails 4.2 support. [#3731] by [@gonzedge] and [@timoschilling]
295
388
  * Rails 5 support. [#4254] by [@seanlinsley]
296
389
  * Rails 5.1 support. [#4882] by [@varyonic]
297
-
298
- #### Minor
299
-
300
390
  * "Create another" checkbox for the new resource page. [#4477] by [@bolshakov]
301
391
  * Page supports belongs_to. [#4759] by [@Fivell] and [@zorab47]
302
392
  * Support for custom sorting strategies. [#4768] by [@Fivell]
@@ -427,6 +517,7 @@ Please check [0-6-stable] for previous changes.
427
517
  [#5052]: https://github.com/activeadmin/activeadmin/pull/5052
428
518
  [#5060]: https://github.com/activeadmin/activeadmin/pull/5060
429
519
  [#5069]: https://github.com/activeadmin/activeadmin/pull/5069
520
+ [#5078]: https://github.com/activeadmin/activeadmin/pull/5078
430
521
  [#5081]: https://github.com/activeadmin/activeadmin/pull/5081
431
522
  [#5088]: https://github.com/activeadmin/activeadmin/pull/5088
432
523
  [#5093]: https://github.com/activeadmin/activeadmin/pull/5093
@@ -486,15 +577,16 @@ Please check [0-6-stable] for previous changes.
486
577
  [#5504]: https://github.com/activeadmin/activeadmin/pull/5504
487
578
  [#5517]: https://github.com/activeadmin/activeadmin/pull/5517
488
579
  [#5537]: https://github.com/activeadmin/activeadmin/pull/5537
580
+ [#5548]: https://github.com/activeadmin/activeadmin/pull/5548
489
581
  [#5555]: https://github.com/activeadmin/activeadmin/pull/5555
490
582
  [#5583]: https://github.com/activeadmin/activeadmin/pull/5583
583
+ [#5590]: https://github.com/activeadmin/activeadmin/pull/5590
491
584
  [#5608]: https://github.com/activeadmin/activeadmin/pull/5608
492
585
  [#5611]: https://github.com/activeadmin/activeadmin/pull/5611
493
586
  [#5627]: https://github.com/activeadmin/activeadmin/pull/5627
494
587
  [#5631]: https://github.com/activeadmin/activeadmin/pull/5631
495
588
  [#5632]: https://github.com/activeadmin/activeadmin/pull/5632
496
589
  [#5650]: https://github.com/activeadmin/activeadmin/pull/5650
497
- [#5590]: https://github.com/activeadmin/activeadmin/pull/5590
498
590
  [#5662]: https://github.com/activeadmin/activeadmin/pull/5662
499
591
  [#5710]: https://github.com/activeadmin/activeadmin/pull/5710
500
592
  [#5726]: https://github.com/activeadmin/activeadmin/pull/5726
@@ -512,13 +604,56 @@ Please check [0-6-stable] for previous changes.
512
604
  [#5822]: https://github.com/activeadmin/activeadmin/pull/5822
513
605
  [#5826]: https://github.com/activeadmin/activeadmin/pull/5826
514
606
  [#5831]: https://github.com/activeadmin/activeadmin/pull/5831
515
- [#5548]: https://github.com/activeadmin/activeadmin/pull/5548
516
607
  [#5842]: https://github.com/activeadmin/activeadmin/pull/5842
517
608
  [#5854]: https://github.com/activeadmin/activeadmin/pull/5854
609
+ [#5855]: https://github.com/activeadmin/activeadmin/pull/5855
610
+ [#5867]: https://github.com/activeadmin/activeadmin/pull/5867
611
+ [#5870]: https://github.com/activeadmin/activeadmin/pull/5870
518
612
  [#5874]: https://github.com/activeadmin/activeadmin/pull/5874
613
+ [#5877]: https://github.com/activeadmin/activeadmin/pull/5877
614
+ [#5886]: https://github.com/activeadmin/activeadmin/pull/5886
615
+ [#5887]: https://github.com/activeadmin/activeadmin/pull/5887
616
+ [#5894]: https://github.com/activeadmin/activeadmin/pull/5894
617
+ [#5895]: https://github.com/activeadmin/activeadmin/pull/5895
618
+ [#5929]: https://github.com/activeadmin/activeadmin/pull/5929
619
+ [#5931]: https://github.com/activeadmin/activeadmin/pull/5931
620
+ [#5938]: https://github.com/activeadmin/activeadmin/pull/5938
621
+ [#5943]: https://github.com/activeadmin/activeadmin/pull/5943
622
+ [#5946]: https://github.com/activeadmin/activeadmin/pull/5946
623
+ [#5956]: https://github.com/activeadmin/activeadmin/pull/5956
624
+ [#5957]: https://github.com/activeadmin/activeadmin/pull/5957
625
+ [#5994]: https://github.com/activeadmin/activeadmin/pull/5994
626
+ [#6000]: https://github.com/activeadmin/activeadmin/pull/6000
627
+ [#6002]: https://github.com/activeadmin/activeadmin/pull/6002
628
+ [#6047]: https://github.com/activeadmin/activeadmin/pull/6047
629
+ [#6086]: https://github.com/activeadmin/activeadmin/pull/6086
630
+ [#6099]: https://github.com/activeadmin/activeadmin/pull/6099
631
+ [#6124]: https://github.com/activeadmin/activeadmin/pull/6124
632
+ [#6149]: https://github.com/activeadmin/activeadmin/pull/6149
633
+ [#6198]: https://github.com/activeadmin/activeadmin/pull/6198
634
+ [#6210]: https://github.com/activeadmin/activeadmin/pull/6210
635
+ [#6221]: https://github.com/activeadmin/activeadmin/pull/6221
636
+ [#6232]: https://github.com/activeadmin/activeadmin/pull/6232
637
+ [#6249]: https://github.com/activeadmin/activeadmin/pull/6249
638
+ [#6315]: https://github.com/activeadmin/activeadmin/pull/6315
639
+ [#6318]: https://github.com/activeadmin/activeadmin/pull/6318
640
+ [#6341]: https://github.com/activeadmin/activeadmin/pull/6341
641
+ [#6368]: https://github.com/activeadmin/activeadmin/pull/6368
642
+ [#6393]: https://github.com/activeadmin/activeadmin/pull/6393
643
+ [#6422]: https://github.com/activeadmin/activeadmin/pull/6422
644
+ [#6451]: https://github.com/activeadmin/activeadmin/pull/6451
645
+ [#6460]: https://github.com/activeadmin/activeadmin/pull/6460
646
+ [#6462]: https://github.com/activeadmin/activeadmin/pull/6462
647
+ [#6487]: https://github.com/activeadmin/activeadmin/pull/6487
648
+ [#6523]: https://github.com/activeadmin/activeadmin/pull/6523
649
+ [#6536]: https://github.com/activeadmin/activeadmin/pull/6536
650
+ [#6548]: https://github.com/activeadmin/activeadmin/pull/6548
651
+ [#6583]: https://github.com/activeadmin/activeadmin/pull/6583
652
+ [#6584]: https://github.com/activeadmin/activeadmin/pull/6584
519
653
 
520
654
  [@5t111111]: https://github.com/5t111111
521
655
  [@aarek]: https://github.com/aarek
656
+ [@adler99]: https://github.com/adler99
522
657
  [@ajw725]: https://github.com/ajw725
523
658
  [@alex-bogomolov]: https://github.com/alex-bogomolov
524
659
  [@amiel]: https://github.com/amiel
@@ -527,10 +662,12 @@ Please check [0-6-stable] for previous changes.
527
662
  [@bartoszkopinski]: https://github.com/bartoszkopinski
528
663
  [@blocknotes]: https://github.com/blocknotes
529
664
  [@bolshakov]: https://github.com/bolshakov
665
+ [@brunvez]: https://github.com/brunvez
530
666
  [@buren]: https://github.com/buren
531
667
  [@chancancode]: https://github.com/chancancode
532
668
  [@chrp]: https://github.com/chrp
533
669
  [@chumakoff]: https://github.com/chumakoff
670
+ [@cprodhomme]: https://github.com/cprodhomme
534
671
  [@craigmcnamara]: https://github.com/craigmcnamara
535
672
  [@DanielHeath]: https://github.com/DanielHeath
536
673
  [@deivid-rodriguez]: https://github.com/deivid-rodriguez
@@ -541,52 +678,77 @@ Please check [0-6-stable] for previous changes.
541
678
  [@drn]: https://github.com/drn
542
679
  [@eikes]: https://github.com/eikes
543
680
  [@f1sherman]: https://github.com/f1sherman
681
+ [@FabioRos]: https://github.com/FabioRos
544
682
  [@faucct]: https://github.com/faucct
545
683
  [@Fivell]: https://github.com/Fivell
684
+ [@fuzziness]: https://github.com/fuzziness
685
+ [@giapnhdev]: https://github.com/giapnhdev
546
686
  [@glebtv]: https://github.com/glebtv
547
687
  [@gonzedge]: https://github.com/gonzedge
688
+ [@guigs]: https://github.com/guigs
548
689
  [@HappyKadaver]: https://github.com/HappyKadaver
690
+ [@imcvampire]: https://github.com/imcvampire
549
691
  [@innparusu95]: https://github.com/innparusu95
550
692
  [@ionut998]: https://github.com/ionut998
551
693
  [@irmela]: https://github.com/irmela
694
+ [@Ivanov-Anton]: https://github.com/Ivanov-Anton
552
695
  [@jasl]: https://github.com/jasl
553
696
  [@javierjulio]: https://github.com/javierjulio
554
697
  [@jawa]: https://github.com/jawa
555
698
  [@JiiHu]: https://github.com/JiiHu
699
+ [@jiikko]: https://github.com/jiikko
556
700
  [@johnnyshields]: https://github.com/johnnyshields
557
701
  [@jscheid]: https://github.com/jscheid
558
702
  [@juril33t]: https://github.com/juril33t
703
+ [@jwesorick]: https://github.com/jwesorick
559
704
  [@kjeldahl]: https://github.com/kjeldahl
705
+ [@ko-lem]: https://github.com/ko-lem
560
706
  [@kobeumut]: https://github.com/kobeumut
561
707
  [@Kris-LIBIS]: https://github.com/Kris-LIBIS
708
+ [@krzcho]: https://github.com/krzcho
562
709
  [@kwent]: https://github.com/kwent
563
710
  [@leio10]: https://github.com/leio10
711
+ [@littleforest]: https://github.com/littleforest
712
+ [@Looooong]: https://github.com/Looooong
564
713
  [@markstory]: https://github.com/markstory
565
714
  [@mauriciopasquier]: https://github.com/mauriciopasquier
566
715
  [@mconiglio]: https://github.com/mconiglio
716
+ [@micred]: https://github.com/micred
717
+ [@mirelon]: https://github.com/mirelon
718
+ [@mshalaby]: https://github.com/mshalaby
719
+ [@munen]: https://github.com/munen
567
720
  [@ndbroadbent]: https://github.com/ndbroadbent
568
721
  [@Nguyenanh]: https://github.com/Nguyenanh
722
+ [@orkhan]: https://github.com/orkhan
569
723
  [@panasyuk]: https://github.com/panasyuk
570
724
  [@PChambino]: https://github.com/PChambino
571
725
  [@potatosalad]: https://github.com/potatosalad
572
726
  [@pranas]: https://github.com/pranas
573
727
  [@renotocn]: https://github.com/renotocn
728
+ [@rn0rno]: https://github.com/rn0rno
574
729
  [@RobinvanderVliet]: https://github.com/RobinvanderVliet
575
730
  [@rogerkk]: https://github.com/rogerkk
731
+ [@roramirez]: https://github.com/roramirez
576
732
  [@seanlinsley]: https://github.com/seanlinsley
577
733
  [@sgara]: https://github.com/sgara
578
734
  [@ShallmentMo]: https://github.com/ShallmentMo
579
735
  [@shekibobo]: https://github.com/shekibobo
580
736
  [@shouya]: https://github.com/shouya
737
+ [@sjieg]: https://github.com/sjieg
581
738
  [@stefsava]: https://github.com/stefsava
582
739
  [@stereoscott]: https://github.com/stereoscott
740
+ [@taralbass]: https://github.com/taralbass
583
741
  [@tiagotex]: https://github.com/tiagotex
584
742
  [@timoschilling]: https://github.com/timoschilling
585
743
  [@TimPetricola]: https://github.com/TimPetricola
744
+ [@utkarsh2102]: https://github.com/utkarsh2102
586
745
  [@varyonic]: https://github.com/varyonic
746
+ [@vcsjones]: https://github.com/vcsjones
747
+ [@vfonic]: https://github.com/vfonic
587
748
  [@violeta-p]: https://github.com/violeta-p
588
749
  [@WaKeMaTTa]: https://github.com/WaKeMaTTa
589
750
  [@wasifhossain]: https://github.com/wasifhossain
751
+ [@westonganger]: https://github.com/westonganger
590
752
  [@Wowu]: https://github.com/Wowu
591
753
  [@wspurgin]: https://github.com/wspurgin
592
754
  [@zorab47]: https://github.com/zorab47
data/CONTRIBUTING.md CHANGED
@@ -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?
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`.
65
71
 
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]
79
-
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.
@@ -144,12 +136,12 @@ git push --set-upstream origin 325-add-japanese-translations
144
136
 
145
137
  Finally, go to GitHub and [make a Pull Request][] :D
146
138
 
147
- CircleCI will run our test suite against all supported Rails versions. We care
148
- about quality, so your PR won't be merged until all tests pass. It's unlikely,
149
- but it's possible that your changes pass tests in one Rails version but fail in
150
- another. In that case, you'll have to setup your development environment (as
151
- explained in step 3) to use the problematic Rails version, and investigate
152
- what's going on!
139
+ Github Actions will run our test suite against all supported Rails versions. We
140
+ care about quality, so your PR won't be merged until all tests pass. It's
141
+ unlikely, but it's possible that your changes pass tests in one Rails version
142
+ but fail in another. In that case, you'll have to setup your development
143
+ environment (as explained in step 3) to use the problematic Rails version, and
144
+ investigate what's going on!
153
145
 
154
146
  ### Keeping your Pull Request updated
155
147
 
@@ -182,34 +174,22 @@ met.
182
174
 
183
175
  Maintainers need to do the following to push out a release:
184
176
 
185
- * 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
-
177
+ * Switch to the master branch and make sure it's up to date.
200
178
  * Make sure you have [chandler] properly configured. Chandler is used to
201
179
  automatically submit github release notes from the changelog right after
202
180
  pushing the gem to rubygems.
203
- * `bin/rake release`
181
+ * Run one of `bin/rake release:prepare_{prerelease,prepatch,patch,preminor,minor,premajor,major}`, push the result and create a PR.
182
+ * Review and merge the PR. The generated changelog in the PR should include all user visible changes you intend to ship.
183
+ * Run `bin/rake release` from the target branch once the PR is merged.
204
184
 
205
185
  [chandler]: https://github.com/mattbrictson/chandler#2-configure-credentials
206
- [mailing list]: http://groups.google.com/group/activeadmin
207
186
  [Stack Overflow]: http://stackoverflow.com/questions/tagged/activeadmin
208
- [search the issue tracker]: https://github.com/activeadmin/activeadmin/issues?q=something
209
187
  [new issue]: https://github.com/activeadmin/activeadmin/issues/new
210
188
  [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
189
  [make a pull request]: https://help.github.com/articles/creating-a-pull-request
214
190
  [git rebasing]: http://git-scm.com/book/en/Git-Branching-Rebasing
215
- [interactive rebase]: https://help.github.com/articles/interactive-rebase
191
+ [interactive rebase]: https://help.github.com/en/github/using-git/about-git-rebase
192
+ [shortcut reference links]: https://github.github.com/gfm/#shortcut-reference-link
193
+ [Rollup]: https://rollupjs.org/guide/en/#quick-start
194
+ [Yarn]: https://yarnpkg.com/en/docs/install
195
+ [Node.js]: https://nodejs.org/en/
data/README.md CHANGED
@@ -4,7 +4,7 @@
4
4
  creating elegant backends for website administration.
5
5
 
6
6
  [![Version ][rubygems_badge]][rubygems]
7
- [![Circle CI ][circle_badge]][circle]
7
+ [![Github Actions ][actions_badge]][actions]
8
8
  [![Coverage ][coverage_badge]][coverage]
9
9
  [![Tidelift ][tidelift_badge]][tidelift]
10
10
  [![Inch CI ][inch_badge]][inch]
@@ -93,15 +93,15 @@ Thanks to [Open Collective][opencollective contributors] and all our Open Collec
93
93
 
94
94
  [rubygems_badge]: http://img.shields.io/gem/v/activeadmin.svg
95
95
  [rubygems]: https://rubygems.org/gems/activeadmin
96
- [circle_badge]: https://circleci.com/gh/activeadmin/activeadmin/tree/master.svg
97
- [circle]: https://circleci.com/gh/activeadmin/activeadmin/tree/master
96
+ [actions_badge]: https://github.com/activeadmin/activeadmin/workflows/ci/badge.svg
97
+ [actions]: https://github.com/activeadmin/activeadmin/actions
98
98
  [coverage_badge]: https://api.codeclimate.com/v1/badges/779e407d22bacff19733/test_coverage
99
99
  [coverage]: https://codeclimate.com/github/activeadmin/activeadmin/test_coverage
100
100
  [inch_badge]: http://inch-ci.org/github/activeadmin/activeadmin.svg?branch=master
101
101
  [inch]: http://inch-ci.org/github/activeadmin/activeadmin
102
102
  [tidelift_badge]: https://tidelift.com/badges/github/activeadmin/activeadmin
103
103
  [tidelift]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=readme
104
- [tidelift_enterprise]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=github&utm_content=enterprise
104
+ [tidelift_enterprise]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=enterprise
105
105
  [tidelift_support]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=github&utm_content=support
106
106
 
107
107
  [docs]: http://activeadmin.info/0-installation.html