activeadmin 2.6.1 → 2.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ce87c19dbaccfc28fd5c36d12f1ef679772a70bd1ae8a131182d277d3de4cb3
-  data.tar.gz: d0b56716796cb013d8d874280366d8fb424366ee3979bf6549585ef505836d79
+  metadata.gz: 0b3beb756b607b196f72d4ec4a4b173867021bb2eba03d183797165810a526b5
+  data.tar.gz: bed4421fc6a28f2ff0bee9659a76bfd680b9432c74d290753c62392c3a7048d3
 SHA512:
-  metadata.gz: fcda92e560081295c175f08b876594a5bc3ea38cfcb523a15e803a086c97306574801d279ffc2f553902a4aaf2e77eece4b4e065bb26a11f12e031b2d0a94257
-  data.tar.gz: ca2e295171c638b40f376bf8fd56a7027c79d08a063b534a666b9761e5f4102b436bfc34cc99b3cf8bab7a12a586fe7c702f62661a885f1291974efb73b14490
+  metadata.gz: 11cce1d23fb4519f394ef13930716fabe39e6d7654f5c4424c887fe54e6d56225700155ae59187ad42a6551d9bcf17f95652c08d234ddafb5ba2d4fb5e444a09
+  data.tar.gz: 452592e57f8fe9f16e683a2f54b9dc7fdd717d1ec2db909710a07cfb74dda5d8f7a0efda515b439555470381da020e75b2d4dfe328a8b52bc436b2f94371525b

data/CHANGELOG.md

@@ -2,7 +2,189 @@
 
 ## Unreleased
 
-## 2.6.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.6.0..2.6.1)
+## 2.13.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.13.0..v2.13.1)
+
+### Bug Fixes
+
+* Honor load paths order when loading admin files. [#7488] by [@tf]
+* Fix passing expected hash payload argument. [#7487] by [@ispyropoulos]
+
+## 2.13.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.12.0..v2.13.0)
+
+### Documentation
+
+* Update validation errors documentation to account for deprecated `ActiveModel::Errors#keys`. [#7475] by [@amit]
+
+### Dependency Changes
+
+* Drop rails 6.0 support. [#7476] by [@deivid-rodriguez]
+
+### Performance
+
+* Fix pundit performance. [#7479] by [@deivid-rodriguez]
+
+## 2.12.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.11.2..v2.12.0)
+
+### Enhancements
+
+* Add Ransack 3 compatibility. [#7453] by [@tagliala]
+
+### Bug Fixes
+
+* Fix pundit namespace detection. [#7144] by [@vlad-psh]
+
+### Documentation
+
+* Don't mention webpacker as the default asset generator in Rails. [#7377] by [@jaynetics]
+
+### Performance
+
+* Avoid duplicate work when downloading CSV. [#7336] by [@deivid-rodriguez]
+
+## 2.11.2 [☰](https://github.com/activeadmin/activeadmin/compare/v2.11.1..v2.11.2)
+
+### Bug Fixes
+
+* Fix disappearing BOM option for `CSVBuilder`. [#7170] by [@Karoid]
+
+## 2.11.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.11.0..v2.11.1)
+
+### Enhancements
+
+* Add turbolinks support to has many js. [#7384] by [@amiel]
+
+### Documentation
+
+* Remove `insert_tag` from Form-Partial docs. [#7394] by [@TonyArra]
+
+## 2.11.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.10.1..v2.11.0)
+
+### Enhancements
+
+* Add Rails 7 Support. [#7235] by [@tagliala]
+
+### Bug Fixes
+
+* Fix form SCSS variables no longer being defined in the outermost scope, so no longer being accessible. [#7341] by [@gigorok]
+
+## 2.10.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.10.0..v2.10.1)
+
+### Enhancements
+
+* Apply `box-sizing: border-box` globally. [#7349] by [@deivid-rodriguez]
+* Vendor normalize 8.0.1. [#7350] by [@deivid-rodriguez]
+* Remove deprecation warning using controller filters inside initializer. [#7340] by [@mgrunberg]
+
+### Bug Fixes
+
+* Fix frozen string error when downloading CSV and streaming disabled. [#7332] by [@deivid-rodriguez]
+
+## 2.10.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.9.0..v2.10.0)
+
+### Enhancements
+
+* Load favicon from Webpacker assets when use_webpacker is set to true. [#6954] by [@Fs00]
+* Don't apply sorting to collection until after scoping. [#7205] by [@agrobbin]
+* Resolve dart sass deprecation warning for division. [#7095] by [@tordans]
+* Use `instrument` from the Notifications API instead of low level `publish`. [#7262] by [@sprql]
+* Avoid mutating string literals. [#6936] by [@tomgilligan]
+* Include print styles in main stylesheet. [#6922] by [@deivid-rodriguez]
+* Use `POST` for OmniAuth links. [#6916] by [@deivid-rodriguez]
+* Scope new record instantiation by authorization scope. [#6884] by [@ngouy]
+* Make `permit_params` and `belongs_to` order independent. [#6906] by [@deivid-rodriguez]
+* Use collection length instead of running COUNTs for limited collections. [#5660] by [@MmKolodziej]
+
+### Bug Fixes
+
+* Show ransackable_scopes filters in search results. [#7127] by [@vlad-psh]
+
+### Translation Improvements
+
+* Fix Dutch translation for password reset button. [#7181] by [@mvz]
+* Add few key to RO pagination.entry. [#6915] by [@lubosch]
+* Change misleading Korean translation. [#6873] by [@1000ship]
+
+### Documentation
+
+* Replace deprecated update_attributes! with update!. [#6959] by [@sergey-alekseev]
+* Clarify docs on user setup. [#6872] by [@javawizard]
+
+### Dependency Changes
+
+* Drop rails 5.2 support. [#7293] by [@deivid-rodriguez]
+* Drop support for Ruby 2.5. [#7236] by [@alejandroperea]
+
+## 2.9.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.8.1..v2.9.0)
+
+### Enhancements
+
+* Support for Rails 6.1. [#6548] by [@deivid-rodriguez]
+* Add ability to override "Remove" button text on has_many forms. [#6523] by [@littleforest]
+* Drop git in gemspec. [#6462] by [@utkarsh2102]
+
+### Bug Fixes
+
+* Pick up upstream fixes in devise templates. [#6536] by [@munen]
+
+### Documentation
+
+* Fix `has_many` syntax in forms documentation. [#6583] by [@krzcho]
+* Add example of using `default_main_content` in show pages. [#6487] by [@sjieg]
+
+### Dependency Changes
+
+* Remove sassc and sprockets runtime dependencies. [#6584] by [@deivid-rodriguez]
+
+## 2.8.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.8.0..v2.8.1)
+
+### Bug Fixes
+
+* Fix `permitted_param` generation for `belongs_to` when `:param` is used. [#6460] by [@deivid-rodriguez]
+* Fix streaming CSV export. [#6451] by [@deivid-rodriguez]
+* Fix input string filter no rendering dropdown input when its column name ends with a ransack predicate. [#6422] by [@Fivell]
+
+## 2.8.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.7.0..v2.8.0)
+
+### Enhancements
+
+* Allow using PORO decorators. [#6249] by [@brunvez]
+* Make sure `ActiveAdmin.routes` provides routes in a consistent order. [#6124] by [@jiikko]
+* Use proper closing tags for HTML in ModalDialog component. [#6221] by [@javierjulio]
+
+### Bug Fixes
+
+* Fix comment layout so regardless of size, each is aligned and spaced evenly. [#6393] by [@Ivanov-Anton]
+
+### Translation Improvements
+
+* Fix several Arabic translations. [#6368] by [@mshalaby]
+* Add missing `scope/all` italian translation. [#6341] by [@fuzziness]
+* Improve Japanese translation. [#6315] by [@rn0rno]
+* Fix es and es-MX sign_in and sign_up translation. [#6210] by [@roramirez]
+
+### Documentation
+
+* Fix filter_columns_for_large_association and filter_method_for_large_association examples. [#6232] by [@ndbroadbent]
+
+### Dependency Changes
+
+* Allow formtastic 4. [#6318] by [@deivid-rodriguez]
+* Drop Ruby 2.4 support. [#6198] by [@deivid-rodriguez]
+
+## 2.7.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.6.1..v2.7.0)
+
+### Enhancements
+
+* Extend menu to allow for nested submenus. [#5994] by [@taralbass]
+* Add Webpacker compatibility with opt-in config switch and installation generator. [#5855] by [@sgara]
+
+### Bug Fixes
+
+* Fix scopes renderer when resource has only optional scopes and their conditions are false. [#6149] by [@Looooong]
+* Fix some missing wrapper markup in "logged out" layout. [#6086] by [@irmela]
+* Fix some typos in Vietnamese translation. [#6099] by [@giapnhdev]
+
+## 2.6.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.6.0..v2.6.1)
 
 ### Bug Fixes
 
@@ -13,7 +195,7 @@
 
 ## 2.6.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.5.0..v2.6.0)
 
-### Enhacements
+### Enhancements
 
 * Display multiple flash messages in separate elements. [#5929] by [@mirelon]
 * Make delete confirmation messages in French & Spanish gender-neutral. [#5946] by [@cprodhomme]
@@ -507,15 +689,17 @@ Please check [0-6-stable] for previous changes.
 [#5504]: https://github.com/activeadmin/activeadmin/pull/5504
 [#5517]: https://github.com/activeadmin/activeadmin/pull/5517
 [#5537]: https://github.com/activeadmin/activeadmin/pull/5537
+[#5548]: https://github.com/activeadmin/activeadmin/pull/5548
 [#5555]: https://github.com/activeadmin/activeadmin/pull/5555
 [#5583]: https://github.com/activeadmin/activeadmin/pull/5583
+[#5590]: https://github.com/activeadmin/activeadmin/pull/5590
 [#5608]: https://github.com/activeadmin/activeadmin/pull/5608
 [#5611]: https://github.com/activeadmin/activeadmin/pull/5611
 [#5627]: https://github.com/activeadmin/activeadmin/pull/5627
 [#5631]: https://github.com/activeadmin/activeadmin/pull/5631
 [#5632]: https://github.com/activeadmin/activeadmin/pull/5632
 [#5650]: https://github.com/activeadmin/activeadmin/pull/5650
-[#5590]: https://github.com/activeadmin/activeadmin/pull/5590
+[#5660]: https://github.com/activeadmin/activeadmin/pull/5660
 [#5662]: https://github.com/activeadmin/activeadmin/pull/5662
 [#5710]: https://github.com/activeadmin/activeadmin/pull/5710
 [#5726]: https://github.com/activeadmin/activeadmin/pull/5726
@@ -533,39 +717,104 @@ Please check [0-6-stable] for previous changes.
 [#5822]: https://github.com/activeadmin/activeadmin/pull/5822
 [#5826]: https://github.com/activeadmin/activeadmin/pull/5826
 [#5831]: https://github.com/activeadmin/activeadmin/pull/5831
-[#5548]: https://github.com/activeadmin/activeadmin/pull/5548
 [#5842]: https://github.com/activeadmin/activeadmin/pull/5842
 [#5854]: https://github.com/activeadmin/activeadmin/pull/5854
+[#5855]: https://github.com/activeadmin/activeadmin/pull/5855
+[#5867]: https://github.com/activeadmin/activeadmin/pull/5867
+[#5870]: https://github.com/activeadmin/activeadmin/pull/5870
 [#5874]: https://github.com/activeadmin/activeadmin/pull/5874
 [#5877]: https://github.com/activeadmin/activeadmin/pull/5877
 [#5886]: https://github.com/activeadmin/activeadmin/pull/5886
-[#5870]: https://github.com/activeadmin/activeadmin/pull/5870
+[#5887]: https://github.com/activeadmin/activeadmin/pull/5887
 [#5894]: https://github.com/activeadmin/activeadmin/pull/5894
 [#5895]: https://github.com/activeadmin/activeadmin/pull/5895
-[#5867]: https://github.com/activeadmin/activeadmin/pull/5867
-[#5887]: https://github.com/activeadmin/activeadmin/pull/5887
+[#5929]: https://github.com/activeadmin/activeadmin/pull/5929
 [#5931]: https://github.com/activeadmin/activeadmin/pull/5931
 [#5938]: https://github.com/activeadmin/activeadmin/pull/5938
-[#5929]: https://github.com/activeadmin/activeadmin/pull/5929
 [#5943]: https://github.com/activeadmin/activeadmin/pull/5943
 [#5946]: https://github.com/activeadmin/activeadmin/pull/5946
 [#5956]: https://github.com/activeadmin/activeadmin/pull/5956
 [#5957]: https://github.com/activeadmin/activeadmin/pull/5957
+[#5994]: https://github.com/activeadmin/activeadmin/pull/5994
 [#6000]: https://github.com/activeadmin/activeadmin/pull/6000
 [#6002]: https://github.com/activeadmin/activeadmin/pull/6002
 [#6047]: https://github.com/activeadmin/activeadmin/pull/6047
-
+[#6086]: https://github.com/activeadmin/activeadmin/pull/6086
+[#6099]: https://github.com/activeadmin/activeadmin/pull/6099
+[#6124]: https://github.com/activeadmin/activeadmin/pull/6124
+[#6149]: https://github.com/activeadmin/activeadmin/pull/6149
+[#6198]: https://github.com/activeadmin/activeadmin/pull/6198
+[#6210]: https://github.com/activeadmin/activeadmin/pull/6210
+[#6221]: https://github.com/activeadmin/activeadmin/pull/6221
+[#6232]: https://github.com/activeadmin/activeadmin/pull/6232
+[#6249]: https://github.com/activeadmin/activeadmin/pull/6249
+[#6315]: https://github.com/activeadmin/activeadmin/pull/6315
+[#6318]: https://github.com/activeadmin/activeadmin/pull/6318
+[#6341]: https://github.com/activeadmin/activeadmin/pull/6341
+[#6368]: https://github.com/activeadmin/activeadmin/pull/6368
+[#6393]: https://github.com/activeadmin/activeadmin/pull/6393
+[#6422]: https://github.com/activeadmin/activeadmin/pull/6422
+[#6451]: https://github.com/activeadmin/activeadmin/pull/6451
+[#6460]: https://github.com/activeadmin/activeadmin/pull/6460
+[#6462]: https://github.com/activeadmin/activeadmin/pull/6462
+[#6487]: https://github.com/activeadmin/activeadmin/pull/6487
+[#6523]: https://github.com/activeadmin/activeadmin/pull/6523
+[#6536]: https://github.com/activeadmin/activeadmin/pull/6536
+[#6548]: https://github.com/activeadmin/activeadmin/pull/6548
+[#6583]: https://github.com/activeadmin/activeadmin/pull/6583
+[#6584]: https://github.com/activeadmin/activeadmin/pull/6584
+[#6872]: https://github.com/activeadmin/activeadmin/pull/6872
+[#6873]: https://github.com/activeadmin/activeadmin/pull/6873
+[#6884]: https://github.com/activeadmin/activeadmin/pull/6884
+[#6906]: https://github.com/activeadmin/activeadmin/pull/6906
+[#6915]: https://github.com/activeadmin/activeadmin/pull/6915
+[#6916]: https://github.com/activeadmin/activeadmin/pull/6916
+[#6922]: https://github.com/activeadmin/activeadmin/pull/6922
+[#6936]: https://github.com/activeadmin/activeadmin/pull/6936
+[#6954]: https://github.com/activeadmin/activeadmin/pull/6954
+[#6959]: https://github.com/activeadmin/activeadmin/pull/6959
+[#7095]: https://github.com/activeadmin/activeadmin/pull/7095
+[#7127]: https://github.com/activeadmin/activeadmin/pull/7127
+[#7144]: https://github.com/activeadmin/activeadmin/pull/7144
+[#7170]: https://github.com/activeadmin/activeadmin/pull/7170
+[#7181]: https://github.com/activeadmin/activeadmin/pull/7181
+[#7205]: https://github.com/activeadmin/activeadmin/pull/7205
+[#7235]: https://github.com/activeadmin/activeadmin/pull/7235
+[#7236]: https://github.com/activeadmin/activeadmin/pull/7236
+[#7262]: https://github.com/activeadmin/activeadmin/pull/7262
+[#7293]: https://github.com/activeadmin/activeadmin/pull/7293
+[#7332]: https://github.com/activeadmin/activeadmin/pull/7332
+[#7336]: https://github.com/activeadmin/activeadmin/pull/7336
+[#7340]: https://github.com/activeadmin/activeadmin/pull/7340
+[#7341]: https://github.com/activeadmin/activeadmin/pull/7341
+[#7349]: https://github.com/activeadmin/activeadmin/pull/7349
+[#7350]: https://github.com/activeadmin/activeadmin/pull/7350
+[#7377]: https://github.com/activeadmin/activeadmin/pull/7377
+[#7384]: https://github.com/activeadmin/activeadmin/pull/7384
+[#7394]: https://github.com/activeadmin/activeadmin/pull/7394
+[#7453]: https://github.com/activeadmin/activeadmin/pull/7453
+[#7475]: https://github.com/activeadmin/activeadmin/pull/7475
+[#7476]: https://github.com/activeadmin/activeadmin/pull/7476
+[#7479]: https://github.com/activeadmin/activeadmin/pull/7479
+[#7487]: https://github.com/activeadmin/activeadmin/pull/7487
+[#7488]: https://github.com/activeadmin/activeadmin/pull/7488
+
+[@1000ship]: https://github.com/1000ship
 [@5t111111]: https://github.com/5t111111
 [@aarek]: https://github.com/aarek
 [@adler99]: https://github.com/adler99
+[@agrobbin]: https://github.com/agrobbin
 [@ajw725]: https://github.com/ajw725
+[@alejandroperea]: https://github.com/alejandroperea
 [@alex-bogomolov]: https://github.com/alex-bogomolov
 [@amiel]: https://github.com/amiel
+[@amit]: https://github.com/amit
 [@amiuhle]: https://github.com/amiuhle
 [@andreslemik]: https://github.com/andreslemik
 [@bartoszkopinski]: https://github.com/bartoszkopinski
 [@blocknotes]: https://github.com/blocknotes
 [@bolshakov]: https://github.com/bolshakov
+[@brunvez]: https://github.com/brunvez
 [@buren]: https://github.com/buren
 [@chancancode]: https://github.com/chancancode
 [@chrp]: https://github.com/chrp
@@ -584,6 +833,10 @@ Please check [0-6-stable] for previous changes.
 [@FabioRos]: https://github.com/FabioRos
 [@faucct]: https://github.com/faucct
 [@Fivell]: https://github.com/Fivell
+[@Fs00]: https://github.com/Fs00
+[@fuzziness]: https://github.com/fuzziness
+[@giapnhdev]: https://github.com/giapnhdev
+[@gigorok]: https://github.com/gigorok
 [@glebtv]: https://github.com/glebtv
 [@gonzedge]: https://github.com/gonzedge
 [@guigs]: https://github.com/guigs
@@ -592,26 +845,42 @@ Please check [0-6-stable] for previous changes.
 [@innparusu95]: https://github.com/innparusu95
 [@ionut998]: https://github.com/ionut998
 [@irmela]: https://github.com/irmela
+[@ispyropoulos]: https://github.com/ispyropoulos
+[@Ivanov-Anton]: https://github.com/Ivanov-Anton
 [@jasl]: https://github.com/jasl
+[@javawizard]: https://github.com/javawizard
 [@javierjulio]: https://github.com/javierjulio
 [@jawa]: https://github.com/jawa
+[@jaynetics]: https://github.com/jaynetics
 [@JiiHu]: https://github.com/JiiHu
+[@jiikko]: https://github.com/jiikko
 [@johnnyshields]: https://github.com/johnnyshields
 [@jscheid]: https://github.com/jscheid
 [@juril33t]: https://github.com/juril33t
 [@jwesorick]: https://github.com/jwesorick
+[@Karoid]: https://github.com/Karoid
 [@kjeldahl]: https://github.com/kjeldahl
 [@ko-lem]: https://github.com/ko-lem
 [@kobeumut]: https://github.com/kobeumut
 [@Kris-LIBIS]: https://github.com/Kris-LIBIS
+[@krzcho]: https://github.com/krzcho
 [@kwent]: https://github.com/kwent
 [@leio10]: https://github.com/leio10
+[@littleforest]: https://github.com/littleforest
+[@Looooong]: https://github.com/Looooong
+[@lubosch]: https://github.com/lubosch
 [@markstory]: https://github.com/markstory
 [@mauriciopasquier]: https://github.com/mauriciopasquier
 [@mconiglio]: https://github.com/mconiglio
+[@mgrunberg]: https://github.com/mgrunberg
 [@micred]: https://github.com/micred
 [@mirelon]: https://github.com/mirelon
+[@MmKolodziej]: https://github.com/MmKolodziej
+[@mshalaby]: https://github.com/mshalaby
+[@munen]: https://github.com/munen
+[@mvz]: https://github.com/mvz
 [@ndbroadbent]: https://github.com/ndbroadbent
+[@ngouy]: https://github.com/ngouy
 [@Nguyenanh]: https://github.com/Nguyenanh
 [@orkhan]: https://github.com/orkhan
 [@panasyuk]: https://github.com/panasyuk
@@ -619,22 +888,35 @@ Please check [0-6-stable] for previous changes.
 [@potatosalad]: https://github.com/potatosalad
 [@pranas]: https://github.com/pranas
 [@renotocn]: https://github.com/renotocn
+[@rn0rno]: https://github.com/rn0rno
 [@RobinvanderVliet]: https://github.com/RobinvanderVliet
 [@rogerkk]: https://github.com/rogerkk
+[@roramirez]: https://github.com/roramirez
 [@seanlinsley]: https://github.com/seanlinsley
+[@sergey-alekseev]: https://github.com/sergey-alekseev
 [@sgara]: https://github.com/sgara
 [@ShallmentMo]: https://github.com/ShallmentMo
 [@shekibobo]: https://github.com/shekibobo
 [@shouya]: https://github.com/shouya
+[@sjieg]: https://github.com/sjieg
+[@sprql]: https://github.com/sprql
 [@stefsava]: https://github.com/stefsava
 [@stereoscott]: https://github.com/stereoscott
+[@tagliala]: https://github.com/tagliala
+[@taralbass]: https://github.com/taralbass
+[@tf]: https://github.com/tf
 [@tiagotex]: https://github.com/tiagotex
 [@timoschilling]: https://github.com/timoschilling
 [@TimPetricola]: https://github.com/TimPetricola
+[@tomgilligan]: https://github.com/tomgilligan
+[@TonyArra]: https://github.com/TonyArra
+[@tordans]: https://github.com/tordans
+[@utkarsh2102]: https://github.com/utkarsh2102
 [@varyonic]: https://github.com/varyonic
 [@vcsjones]: https://github.com/vcsjones
 [@vfonic]: https://github.com/vfonic
 [@violeta-p]: https://github.com/violeta-p
+[@vlad-psh]: https://github.com/vlad-psh
 [@WaKeMaTTa]: https://github.com/WaKeMaTTa
 [@wasifhossain]: https://github.com/wasifhossain
 [@westonganger]: https://github.com/westonganger

data/CONTRIBUTING.md

@@ -63,7 +63,7 @@ If you want to test against a Rails version different from the latest, make sure
 you use the correct Gemfile, for example:
 
 ```sh
-export BUNDLE_GEMFILE=gemfiles/rails_60/Gemfile
+export BUNDLE_GEMFILE=gemfiles/rails_61/Gemfile
 ```
 
 **Warning** SCSS assets are aimed to be used indifferently with Sprockets **and** webpacker.
@@ -115,22 +115,6 @@ checks as the rest of the project. `bin/rake lint` will give you feedback in
 this regard. You can check & fix style issues by running each linter
 individually. Run `bin/rake -T lint` to see the available linters.
 
-### Add a changelog entry
-
-If your PR includes user-observable changes, you'll be asked to add a changelog
-entry following the existing changelog format.
-
-The changelog format is the following:
-
-* One line per PR describing your fix or enhancement.
-* Entries end with a dot, followed by "[#pr-number] by [@github-username]".
-* Entries are added under the "Unreleased" section at the top of the file, under
-  the "Bug Fixes" or "Enhancements" subsection.
-* References to github usernames and pull requests use [shortcut reference
-  links].
-* Your github username reference definition is included in the correct
-  alphabetical position at the bottom of the file.
-
 ### Make a Pull Request
 
 At this point, you should switch back to your master branch and make sure it's
@@ -152,12 +136,12 @@ git push --set-upstream origin 325-add-japanese-translations
 
 Finally, go to GitHub and [make a Pull Request][] :D
 
-CircleCI will run our test suite against all supported Rails versions. We care
-about quality, so your PR won't be merged until all tests pass. It's unlikely,
-but it's possible that your changes pass tests in one Rails version but fail in
-another. In that case, you'll have to setup your development environment (as
-explained in step 3) to use the problematic Rails version, and investigate
-what's going on!
+Github Actions will run our test suite against all supported Rails versions. We
+care about quality, so your PR won't be merged until all tests pass. It's
+unlikely, but it's possible that your changes pass tests in one Rails version
+but fail in another. In that case, you'll have to setup your development
+environment (as explained in step 3) to use the problematic Rails version, and
+investigate what's going on!
 
 ### Keeping your Pull Request updated
 
@@ -190,12 +174,12 @@ met.
 
 Maintainers need to do the following to push out a release:
 
-* Make sure all pull requests are in and that changelog is current
 * Switch to the master branch and make sure it's up to date.
 * Make sure you have [chandler] properly configured. Chandler is used to
   automatically submit github release notes from the changelog right after
   pushing the gem to rubygems.
 * Run one of `bin/rake release:prepare_{prerelease,prepatch,patch,preminor,minor,premajor,major}`, push the result and create a PR.
+* Review and merge the PR. The generated changelog in the PR should include all user visible changes you intend to ship.
 * Run `bin/rake release` from the target branch once the PR is merged.
 
 [chandler]: https://github.com/mattbrictson/chandler#2-configure-credentials
@@ -204,7 +188,7 @@ Maintainers need to do the following to push out a release:
 [fork Active Admin]: https://help.github.com/articles/fork-a-repo
 [make a pull request]: https://help.github.com/articles/creating-a-pull-request
 [git rebasing]: http://git-scm.com/book/en/Git-Branching-Rebasing
-[interactive rebase]: https://help.github.com/articles/interactive-rebase
+[interactive rebase]: https://help.github.com/en/github/using-git/about-git-rebase
 [shortcut reference links]: https://github.github.com/gfm/#shortcut-reference-link
 [Rollup]: https://rollupjs.org/guide/en/#quick-start
 [Yarn]: https://yarnpkg.com/en/docs/install

data/README.md

@@ -4,7 +4,7 @@
 creating elegant backends for website administration.
 
 [![Version         ][rubygems_badge]][rubygems]
-[![Circle CI       ][circle_badge]][circle]
+[![Github Actions  ][actions_badge]][actions]
 [![Coverage        ][coverage_badge]][coverage]
 [![Tidelift        ][tidelift_badge]][tidelift]
 [![Inch CI         ][inch_badge]][inch]
@@ -93,15 +93,15 @@ Thanks to [Open Collective][opencollective contributors] and all our Open Collec
 
 [rubygems_badge]: http://img.shields.io/gem/v/activeadmin.svg
 [rubygems]: https://rubygems.org/gems/activeadmin
-[circle_badge]: https://circleci.com/gh/activeadmin/activeadmin/tree/master.svg?style=svg
-[circle]: https://circleci.com/gh/activeadmin/activeadmin/tree/master
+[actions_badge]: https://github.com/activeadmin/activeadmin/workflows/ci/badge.svg
+[actions]: https://github.com/activeadmin/activeadmin/actions
 [coverage_badge]: https://api.codeclimate.com/v1/badges/779e407d22bacff19733/test_coverage
 [coverage]: https://codeclimate.com/github/activeadmin/activeadmin/test_coverage
 [inch_badge]: http://inch-ci.org/github/activeadmin/activeadmin.svg?branch=master
 [inch]: http://inch-ci.org/github/activeadmin/activeadmin
 [tidelift_badge]: https://tidelift.com/badges/github/activeadmin/activeadmin
 [tidelift]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=readme
-[tidelift_enterprise]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=github&utm_content=enterprise
+[tidelift_enterprise]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=enterprise
 [tidelift_support]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=github&utm_content=support
 
 [docs]: http://activeadmin.info/0-installation.html