activeadmin 1.4.3 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29d7c95a552afce6991952dc4d0e4006b2d354172ad46e897ccb4765e4d04f3f
-  data.tar.gz: 319f648ea6256a882a18f683f6dcc770f7b2ab54fdfd98e2b0a35fd511a34dc2
+  metadata.gz: 563d1b0d5a864fbade2689270fb82575242d8c557f4c4807e45d5fb6d3679ccb
+  data.tar.gz: 0076ad12634d0c8762697204639d0ce9447f051fd4b6827da3a09e4fdf7dcb1b
 SHA512:
-  metadata.gz: f73c6de3272fc66e167e93f99392ad2bd1d78629635c3d7f58adc1171e2d7df9bf2cee8de5f2e701d8d49eaa29f945f46285c5493de73a377982801014447378
-  data.tar.gz: 4dd517e49cd37d1469e6d530d7677d1a8a1b6ee8069dea3f1c27e1c764c39b2fe67790ecc3f1e37e974cfb51967dcaf61e8a8fe811bf8ac79a0002703f6cc0ed
+  metadata.gz: 7cdc8ddd8ba6452996a80f098cde70512a83215c4731d03b7a0b0a9d601f5886c12f5db824be5aaf0ecb92a8151f0685ad65f95d1c7f623767613f4a46e29617
+  data.tar.gz: 7b14dc13a08928a73f48bfcd4972d20b4a2d33db3c29afb1769ab63c3654cbe6e711e6ff8f39b4b131af6c94c060ac6b5056abb6494cafc4b6c3a13f99bbb7db

data/CHANGELOG.md

@@ -2,26 +2,132 @@
 
 ## Unreleased
 
-## 1.4.3 [☰](https://github.com/activeadmin/activeadmin/compare/v1.4.2...v1.4.3)
+## 2.3.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.3.0..v2.3.1)
+
+### Bug Fixes
+
+* 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]
+
+## 2.3.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.2.0..v2.3.0)
+
+### Enhancements
+
+#### Minor
+
+* Bump minimum ransack requirement to make sure everyone gets a version that works ok with all supported versions of Rails. [#5831] by [@deivid-rodriguez]
+
+### Bug Fixes
+
+* Fix CSVBuilder not respecting `ActiveAdmin.application.csv_options = { humanize_name: false }` setting. [#5800] by [@HappyKadaver]
+* Fix crash when displaying current filters after filtering by a nested resource. [#5816] by [@deivid-rodriguez]
+* Fix pagination when `pagination_total` is false to not show a "Last" link, since it's incorrect because we don't have the total pages information. [#5822] by [@deivid-rodriguez]
+* Fix optional nested resources causing incorrect routes to be generated, when renamed resources (through `:as` option) are involved. [#5826] by [@ndbroadbent], [@Kris-LIBIS] and [@deivid-rodriguez]
+* Fix double modal issue in applications using turbolinks 5. [#5842] by [@sgara]
+
+## 2.2.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.1.0..v2.2.0)
+
+### Enhancements
+
+#### Minor
+
+* 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]
+* Add Macedonian locale. [#5710] by [@violeta-p]
+
+### Bug Fixes
+
+* Fix pundit policy retrieving for static pages when the pundit namespace is :active_admin. [#5777] by [@kwent]
+* Fix show page title not being properly escaped if title's content included HTML. [#5802] by [@deivid-rodriguez]
+* Revert [21b6138f] from [#5740] since it actually caused the performance in development to regress. [#5801] by [@deivid-rodriguez]
+
+## 2.1.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.0.0..v2.1.0)
+
+### Bug Fixes
+
+* Ensure application gets reloaded only once. [#5740] by [@jscheid]
+* Crash when rendering comments from a custom controller block. [#5758] by [@deivid-rodriguez]
+* 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]
+
+### Removals
+
+* Support for ruby 2.3 has been removed. [#5751] by [@deivid-rodriguez]
+
+## 2.0.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.0.0.rc2..v2.0.0)
+
+_No changes_.
+
+## 2.0.0.rc2 [☰](https://github.com/activeadmin/activeadmin/compare/v2.0.0.rc1..v2.0.0.rc2)
+
+### Enhancements
+
+#### Minor
+
+* Require arbre `~> 1.2, >= 1.2.1`. [#5726] by [@ionut998], and [#5738] by [@deivid-rodriguez]
+
+## 2.0.0.rc1 [☰](https://github.com/activeadmin/activeadmin/compare/v1.4.3..v2.0.0.rc1)
+
+### Enhancements
+
+* Add your own content to the site `<head>`, like analytics. [#5590] by [@buren]
+
+  ```ruby
+  ActiveAdmin.setup do |config|
+    config.head = ''.html_safe
+  end
+  ```
+
+* Consider authorization when displaying comments in show page. [#5555] by [@amiuhle]
+
+#### Minor
+
+* Add better support for rendering lists. [#5370] by [@dkniffin]
+* 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]
+
+### Security Fixes
+
+* Prevent leaking hashed passwords via user CSV export and adds a config option for sensitive attributes. [#5486] by [@chrp]
+
+### Bug Fixes
+
+* Fix for paginated collections with `per_page: Array, pagination_total: false`. [#5627] by [@bartoszkopinski]
+* Restrict ransack requirement to >= 2.1.1 to play nice with Rails 5.2.2. [#5632] by [@deivid-rodriguez]
+* Bad interpolation variables on pagination keys in Lithuanian translation. [#5631] by [@deivid-rodriguez]
+* Tabs are not correctly created when using non-transliteratable characters as title. [#5650] by [@panasyuk]
+* Sidebar title internationalization. [#5417] by [@WaKeMaTTa]
+* `filter` labels not allowing a `Proc` to be passed. [#5418] by [@WaKeMaTTa]
+
+### Removals
+
+* Rails 4.2 support has been dropped. [#5104] by [@javierjulio] and [@deivid-rodriguez]
+* Dependency on coffee-rails has been removed. [#5081] by [@javierjulio]
+  If your application uses coffescript but was relying on ActiveAdmin to provide
+  the dependency, you need to add the `coffee-script` gem to your `Gemfile` to
+  restore it. If your only usage of coffescript was the
+  `active_admin.js.coffee` generated by ActiveAdmin's generator, you can also
+  convert that file to plain JS (`//= require active_admin/base` if you
+  didn't add any stuff to it).
+* Devise 3 support has been dropped. [#5608] by [@deivid-rodriguez] and [@javierjulio]
+* `action_item` without a name has been removed. [#5099] by [@javierjulio]
+
+## 1.4.3 [☰](https://github.com/activeadmin/activeadmin/compare/v1.4.2..v1.4.3)
 
 ### Bug Fixes
 
 * Fix `form` parameter to `batch_action` no longer accepting procs. [#5611] by [@buren] and [@deivid-rodriguez]
 * Fix passing a proc to `scope_to`. [#5611] by [@deivid-rodriguez]
 
-## 1.4.2 [☰](https://github.com/activeadmin/activeadmin/compare/v1.4.1...v1.4.2)
+## 1.4.2 [☰](https://github.com/activeadmin/activeadmin/compare/v1.4.1..v1.4.2)
 
 ### Bug Fixes
 
 * Fix `input_html` filter option evaluated only once. [#5376] by [@kjeldahl]
 
-## 1.4.1 [☰](https://github.com/activeadmin/activeadmin/compare/v1.4.0...v1.4.1)
+## 1.4.1 [☰](https://github.com/activeadmin/activeadmin/compare/v1.4.0..v1.4.1)
 
 ### Bug Fixes
 
 * Fix menu item link with method delete. [#5583] by [@tiagotex]
 
-## 1.4.0 [☰](https://github.com/activeadmin/activeadmin/compare/v1.3.1...v1.4.0)
+## 1.4.0 [☰](https://github.com/activeadmin/activeadmin/compare/v1.3.1..v1.4.0)
 
 ### Enhancements
 
@@ -54,13 +160,13 @@
 * Fixed resource filtering by association when the resource has custom primary key. [#5446] by [@wasifhossain]
 * Fixed "create anoter" checkbox styling. [#5324] by [@faucct]
 
-## 1.3.1 [☰](https://github.com/activeadmin/activeadmin/compare/v1.3.0...v1.3.1)
+## 1.3.1 [☰](https://github.com/activeadmin/activeadmin/compare/v1.3.0..v1.3.1)
 
 ### Bug Fixes
 
 * gemspec should have more permissive ransack dependency. [#5448] by [@varyonic]
 
-## 1.3.0 [☰](https://github.com/activeadmin/activeadmin/compare/v1.2.1...v1.3.0)
+## 1.3.0 [☰](https://github.com/activeadmin/activeadmin/compare/v1.2.1..v1.3.0)
 
 ### Enhancements
 
@@ -68,13 +174,13 @@
 
 * Rails 5.2 support [#5343] by [@varyonic], [#5399], [#5401] by [@zorab47]
 
-## 1.2.1 [☰](https://github.com/activeadmin/activeadmin/compare/v1.2.0...v1.2.1)
+## 1.2.1 [☰](https://github.com/activeadmin/activeadmin/compare/v1.2.0..v1.2.1)
 
 ### Bug Fixes
 
 * Resolve issue with [#5275] preventing XSS in filters sidebar. [#5299] by [@faucct]
 
-## 1.2.0 [☰](https://github.com/activeadmin/activeadmin/compare/v1.1.0...v1.2.0)
+## 1.2.0 [☰](https://github.com/activeadmin/activeadmin/compare/v1.1.0..v1.2.0)
 
 ### Enhancements
 
@@ -101,7 +207,7 @@
 * Fixed [#5198] Prevent XSS on sidebar's current filter rendering. [#5275] by [@deivid-rodriguez]
 * Sanitize display_name. [#5284] by [@markstory]
 
-## 1.1.0 [☰](https://github.com/activeadmin/activeadmin/compare/v1.0.0...v1.1.0)
+## 1.1.0 [☰](https://github.com/activeadmin/activeadmin/compare/v1.0.0..v1.1.0)
 
 ### Bug Fixes
 
@@ -158,7 +264,7 @@
 * Allow passing a class to `action_item` block. [#4997] by [@Fivell]
 * Add pagination to the comments section. [#5088] by [@alex-bogomolov]
 
-## 1.0.0 [☰](https://github.com/activeadmin/activeadmin/compare/v0.6.3...v1.0.0)
+## 1.0.0 [☰](https://github.com/activeadmin/activeadmin/compare/v0.6.3..v1.0.0)
 
 ### Breaking Changes
 
@@ -187,7 +293,7 @@
 * Page supports belongs_to. [#4759] by [@Fivell] and [@zorab47]
 * Support for custom sorting strategies. [#4768] by [@Fivell]
 * Stream CSV downloads as they're generated. [#3038] by [@craigmcnamara]
-  * Disable streaming in development for easier debugging. [#3535] by [@seanlinsley]
+* Disable streaming in development for easier debugging. [#3535] by [@seanlinsley]
 * Improved code reloading. [#3783] by [@chancancode]
 * Do not auto link to inaccessible actions. [#3686] by [@pranas]
 * Allow to enable comments on per-resource basis. [#3695] by [@pranas]
@@ -247,6 +353,8 @@
   ActiveSupport::Notifications.publish ActiveAdmin::Application::BeforeLoadEvent, "some data"
   ```
 
+* `action_item` without a name, to introduce a solution for removing action items (`remove_action_item(name)`). [#3091] by [@amiel]
+
 ## Previous Changes
 
 Please check [0-6-stable] for previous changes.
@@ -284,6 +392,9 @@ Please check [0-6-stable] for previous changes.
 [#5043]: https://github.com/activeadmin/activeadmin/issues/5043
 [#5198]: https://github.com/activeadmin/activeadmin/issues/5198
 
+[21b6138f]: https://github.com/activeadmin/activeadmin/pull/5740/commits/21b6138fdcf58cd54c3f1d3f60cb1127b174b40f
+
+[#3091]: https://github.com/activeadmin/activeadmin/pull/3091
 [#3435]: https://github.com/activeadmin/activeadmin/pull/3435
 [#4477]: https://github.com/activeadmin/activeadmin/pull/4477
 [#4731]: https://github.com/activeadmin/activeadmin/pull/4731
@@ -308,8 +419,11 @@ Please check [0-6-stable] for previous changes.
 [#5052]: https://github.com/activeadmin/activeadmin/pull/5052
 [#5060]: https://github.com/activeadmin/activeadmin/pull/5060
 [#5069]: https://github.com/activeadmin/activeadmin/pull/5069
+[#5081]: https://github.com/activeadmin/activeadmin/pull/5081
 [#5088]: https://github.com/activeadmin/activeadmin/pull/5088
 [#5093]: https://github.com/activeadmin/activeadmin/pull/5093
+[#5099]: https://github.com/activeadmin/activeadmin/pull/5099
+[#5104]: https://github.com/activeadmin/activeadmin/pull/5104
 [#5119]: https://github.com/activeadmin/activeadmin/pull/5119
 [#5120]: https://github.com/activeadmin/activeadmin/pull/5120
 [#5125]: https://github.com/activeadmin/activeadmin/pull/5125
@@ -343,12 +457,15 @@ Please check [0-6-stable] for previous changes.
 [#5357]: https://github.com/activeadmin/activeadmin/pull/5357
 [#5359]: https://github.com/activeadmin/activeadmin/pull/5359
 [#5368]: https://github.com/activeadmin/activeadmin/pull/5368
+[#5370]: https://github.com/activeadmin/activeadmin/pull/5370
 [#5375]: https://github.com/activeadmin/activeadmin/pull/5375
 [#5376]: https://github.com/activeadmin/activeadmin/pull/5376
 [#5399]: https://github.com/activeadmin/activeadmin/pull/5399
 [#5401]: https://github.com/activeadmin/activeadmin/pull/5401
 [#5408]: https://github.com/activeadmin/activeadmin/pull/5408
 [#5413]: https://github.com/activeadmin/activeadmin/pull/5413
+[#5417]: https://github.com/activeadmin/activeadmin/pull/5417
+[#5418]: https://github.com/activeadmin/activeadmin/pull/5418
 [#5433]: https://github.com/activeadmin/activeadmin/pull/5433
 [#5446]: https://github.com/activeadmin/activeadmin/pull/5446
 [#5448]: https://github.com/activeadmin/activeadmin/pull/5448
@@ -356,16 +473,45 @@ Please check [0-6-stable] for previous changes.
 [#5458]: https://github.com/activeadmin/activeadmin/pull/5458
 [#5461]: https://github.com/activeadmin/activeadmin/pull/5461
 [#5464]: https://github.com/activeadmin/activeadmin/pull/5464
+[#5486]: https://github.com/activeadmin/activeadmin/pull/5486
 [#5501]: https://github.com/activeadmin/activeadmin/pull/5501
+[#5504]: https://github.com/activeadmin/activeadmin/pull/5504
 [#5517]: https://github.com/activeadmin/activeadmin/pull/5517
 [#5537]: https://github.com/activeadmin/activeadmin/pull/5537
+[#5555]: https://github.com/activeadmin/activeadmin/pull/5555
 [#5583]: https://github.com/activeadmin/activeadmin/pull/5583
+[#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
+[#5662]: https://github.com/activeadmin/activeadmin/pull/5662
+[#5710]: https://github.com/activeadmin/activeadmin/pull/5710
+[#5726]: https://github.com/activeadmin/activeadmin/pull/5726
+[#5738]: https://github.com/activeadmin/activeadmin/pull/5738
+[#5740]: https://github.com/activeadmin/activeadmin/pull/5740
+[#5751]: https://github.com/activeadmin/activeadmin/pull/5751
+[#5758]: https://github.com/activeadmin/activeadmin/pull/5758
+[#5777]: https://github.com/activeadmin/activeadmin/pull/5777
+[#5794]: https://github.com/activeadmin/activeadmin/pull/5794
+[#5800]: https://github.com/activeadmin/activeadmin/pull/5800
+[#5801]: https://github.com/activeadmin/activeadmin/pull/5801
+[#5802]: https://github.com/activeadmin/activeadmin/pull/5802
+[#5816]: https://github.com/activeadmin/activeadmin/pull/5816
+[#5822]: https://github.com/activeadmin/activeadmin/pull/5822
+[#5826]: https://github.com/activeadmin/activeadmin/pull/5826
+[#5831]: https://github.com/activeadmin/activeadmin/pull/5831
+[#5842]: https://github.com/activeadmin/activeadmin/pull/5842
+[#5854]: https://github.com/activeadmin/activeadmin/pull/5854
 
 [@5t111111]: https://github.com/5t111111
 [@aarek]: https://github.com/aarek
 [@ajw725]: https://github.com/ajw725
 [@alex-bogomolov]: https://github.com/alex-bogomolov
+[@amiel]: https://github.com/amiel
+[@amiuhle]: https://github.com/amiuhle
 [@andreslemik]: https://github.com/andreslemik
 [@blocknotes]: https://github.com/blocknotes
 [@bolshakov]: https://github.com/bolshakov
@@ -377,6 +523,7 @@ Please check [0-6-stable] for previous changes.
 [@deivid-rodriguez]: https://github.com/deivid-rodriguez
 [@dennisvdvliet]: https://github.com/dennisvdvliet
 [@dhyegofernando]: https://github.com/dhyegofernando
+[@dkniffin]: https://github.com/dkniffin
 [@dmitry]: https://github.com/dmitry
 [@drn]: https://github.com/drn
 [@eikes]: https://github.com/eikes
@@ -385,7 +532,9 @@ Please check [0-6-stable] for previous changes.
 [@Fivell]: https://github.com/Fivell
 [@glebtv]: https://github.com/glebtv
 [@gonzedge]: https://github.com/gonzedge
+[@HappyKadaver]: https://github.com/HappyKadaver
 [@innparusu95]: https://github.com/innparusu95
+[@ionut998]: https://github.com/ionut998
 [@jasl]: https://github.com/jasl
 [@javierjulio]: https://github.com/javierjulio
 [@jawa]: https://github.com/jawa
@@ -393,6 +542,7 @@ Please check [0-6-stable] for previous changes.
 [@johnnyshields]: https://github.com/johnnyshields
 [@kjeldahl]: https://github.com/kjeldahl
 [@kobeumut]: https://github.com/kobeumut
+[@kwent]: https://github.com/kwent
 [@leio10]: https://github.com/leio10
 [@markstory]: https://github.com/markstory
 [@mauriciopasquier]: https://github.com/mauriciopasquier
@@ -415,6 +565,15 @@ Please check [0-6-stable] for previous changes.
 [@TimPetricola]: https://github.com/TimPetricola
 [@varyonic]: https://github.com/varyonic
 [@wasifhossain]: https://github.com/wasifhossain
+[@WaKeMaTTa]: https://github.com/WaKeMaTTa
 [@Wowu]: https://github.com/Wowu
 [@wspurgin]: https://github.com/wspurgin
 [@zorab47]: https://github.com/zorab47
+[@chrp]: https://github.com/chrp
+[@bartoszkopinski]: https://github.com/bartoszkopinski
+[@panasyuk]: https://github.com/panasyuk
+[@jscheid]: https://github.com/jscheid
+[@violeta-p]: https://github.com/violeta-p
+[@ndbroadbent]: https://github.com/ndbroadbent
+[@Kris-LIBIS]: https://github.com/Kris-LIBIS
+[@sgara]: https://github.com/sgara

data/CONTRIBUTING.md

@@ -26,8 +26,7 @@ git checkout -b 325-add-japanese-translations
 Make sure you're using a recent ruby and have the `bundler` gem installed, at
 least version `1.14.3`.
 
-You'll also need chrome and [chromedriver] installed in order to run cucumber
-scenarios.
+You'll also need chrome installed in order to run cucumber scenarios.
 
 Now install the development dependencies:
 
@@ -38,10 +37,10 @@ bundle install
 Now you should be able to run the entire suite using:
 
 ```sh
-bundle exec rake
+bin/rake
 ```
 
-The test run will generate a sample Rails application in `spec/rails` to run the
+The test run will generate a sample Rails application in `tmp/test_apps` to run the
 tests against.
 
 If your tests are passing locally but they're failing on CircleCI, it's probably
@@ -91,11 +90,11 @@ a look at your changes in a browser.
 To boot up a test Rails app:
 
 ```sh
-bundle exec rake local server
+bin/rake local server
 ```
 
 This will automatically create a Rails app if none already exists, and store it
-in the `.test-rails-apps` folder.
+in the `tmp/development_apps` folder.
 
 You should now be able to open <http://localhost:3000/admin> in your browser.
 You can log in using:
@@ -107,21 +106,22 @@ If you need to perform any other commands on the test application, just pass
 them to the `local` rake task. For example, to boot the rails console:
 
 ```sh
-bundle exec rake local console
+bin/rake local console
 ```
 
-Or to migrate the database:
+Or to migrate the database, if you create a new migration or just play around
+with the db:
 
 ```sh
-bundle exec rake local db:migrate
+bin/rake local db:migrate
 ```
 
 ### Get the style right
 
 Your patch should follow the same conventions & pass the same code quality
-checks as the rest of the project. `bundle exec rake lint` will give you
-feedback in this regard. You can check & fix style issues by running each linter
-individually. Run `bundle exec rake -T lint` to see the available linters.
+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.
 
 ### Make a Pull Request
 
@@ -200,17 +200,16 @@ Maintainers need to do the following to push out a release:
 * 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.
-* `bundle exec rake release`
+* `bin/rake release`
 
 [chandler]: https://github.com/mattbrictson/chandler#2-configure-credentials
-[chromedriver]: https://sites.google.com/a/chromium.org/chromedriver/getting-started
 [mailing list]: http://groups.google.com/group/activeadmin
 [Stack Overflow]: http://stackoverflow.com/questions/tagged/activeadmin
 [search the issue tracker]: https://github.com/activeadmin/activeadmin/issues?q=something
 [new issue]: https://github.com/activeadmin/activeadmin/issues/new
 [fork Active Admin]: https://help.github.com/articles/fork-a-repo
 [searching all issues]: https://github.com/activeadmin/activeadmin/issues?q=
-[master template]: https://github.com/activeadmin/activeadmin/blob/master/lib/bug_report_templates/active_admin_master.rb
+[master template]: https://github.com/activeadmin/activeadmin/blob/master/tasks/bug_report_template.rb
 [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

data/README.md

@@ -21,6 +21,11 @@ creating elegant backends for website administration.
 * Try the [live demo][demo].
 * The [wiki] includes links to tutorials, articles and sample projects.
 
+## For enterprise
+
+Active Admin for enterprise is available via the Tidelift subscription. [Learn
+More][tidelift_enterprise].
+
 ## Need help?
 
 Please use [StackOverflow][stackoverflow] for help requests and how-to questions.
@@ -32,16 +37,22 @@ Google Groups, IRC #activeadmin and Gitter are not actively monitored.
 
 ## Want to contribute?
 
-The [contributing guide][contributing]
-is a good place to start. If you have questions, feel free to ask.
+If you want to contribute through code or documentation, the [Contributing
+guide is the best place to start][contributing]. If you have questions, feel free
+to ask.
 
 ## Want to support us?
 
-Subscribe to [Tidelift][tidelift] to support Active Admin and get licensing assurances and timely security notifications.
+If you want to support us financially, you can [help fund the project
+through a Tidelift subscription][tidelift_support]. By buying a Tidelift subscription
+you make sure your whole dependency stack is properly maintained, while also
+getting a comprehensive view of outdated dependencies, new releases, security
+alerts, and licensing compatibility issues.
 
-You can support us with a weekly tip via [Liberapay][liberapay.com].
+You can also support us with a weekly tip via [Liberapay].
 
-[![Support via Liberapay][liberapay_button]][liberapay_donate]
+Finally, we have an [Open Collective][opencollective page] where you can become a backer or
+sponsor for the project, and also submit expenses to it.
 
 ## Dependencies
 
@@ -56,6 +67,23 @@ Tool                  | Description
 [Kaminari]            | Elegant pagination for any sort of collection
 [Ransack]             | Provides a simple search API to query your data
 
+## Security contact information
+
+Please use the Tidelift security contact to [report a security vulnerability][Tidelift security contact].
+Tidelift will coordinate the fix and disclosure.
+
+## Acknowledgements
+
+Thanks to [Greg Bell][Greg] for creating and sharing this project with the open source community.
+
+Thanks to [all the people that ever contributed through code][contributors] or
+other means such as bug reports, issue triaging, feature suggestions, code
+snippet tips, Slack discussions and so on.
+
+Thanks to [Tidelift][tidelift] and all our Tidelift subscribers.
+
+Thanks to [Open Collective][opencollective contributors] and all our Open Collective contributors.
+
 [Arbre]: https://github.com/activeadmin/arbre
 [Devise]: https://github.com/plataformatec/devise
 [Formtastic]: https://github.com/justinfrench/formtastic
@@ -73,12 +101,17 @@ Tool                  | Description
 [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_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
 [demo]: http://demo.activeadmin.info/admin
 [wiki]: https://github.com/activeadmin/activeadmin/wiki
 [stackoverflow]: http://stackoverflow.com/questions/tagged/activeadmin
 [contributing]: https://github.com/activeadmin/activeadmin/blob/master/CONTRIBUTING.md
-[liberapay.com]: https://liberapay.com
-[liberapay_button]: https://liberapay.com/assets/widgets/donate.svg
-[liberapay_donate]: https://liberapay.com/Active-Admin/donate
+[Liberapay]: https://liberapay.com/Active-Admin/donate
+[Tidelift security contact]: https://tidelift.com/security
+[Greg]: https://github.com/gregbell
+[contributors]: https://github.com/activeadmin/activeadmin/graphs/contributors
+[opencollective page]: https://opencollective.com/activeadmin
+[opencollective contributors]: https://opencollective.com/activeadmin#contributors