activeadmin 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b2d9707cdad7f598163f5c46ca966ae2fd6b88d67dd679a35b2ee93b9e745c4
-  data.tar.gz: 719b7941e79ffff45fe53f01e89a19db6be58528329c54dc17e190bd4db8fddb
+  metadata.gz: 29d7c95a552afce6991952dc4d0e4006b2d354172ad46e897ccb4765e4d04f3f
+  data.tar.gz: 319f648ea6256a882a18f683f6dcc770f7b2ab54fdfd98e2b0a35fd511a34dc2
 SHA512:
-  metadata.gz: 29bf6765fdaeea4bea02691c2ab88fe513765d619b91d1bf045b52e078e97c0673cdce34a6ab3e4f197e8fd6023b3a36c1845d93b40b39da5564321105cc963a
-  data.tar.gz: 58730ca45ae1a34cfa5b41e8a9735db5527110c054e42d30965e227d28c470e8e90123605aa411f693f3f9ecc649caa5b8ff2ac0a26b26f57a6649c01ec62dc5
+  metadata.gz: f73c6de3272fc66e167e93f99392ad2bd1d78629635c3d7f58adc1171e2d7df9bf2cee8de5f2e701d8d49eaa29f945f46285c5493de73a377982801014447378
+  data.tar.gz: 4dd517e49cd37d1469e6d530d7677d1a8a1b6ee8069dea3f1c27e1c764c39b2fe67790ecc3f1e37e974cfb51967dcaf61e8a8fe811bf8ac79a0002703f6cc0ed

data/.circleci/config.yml

@@ -20,7 +20,7 @@ version: 2.1
 .install_dependencies: &install_dependencies
   run:
     name: Install dependencies
-    command: bundle install --without development --path /home/circleci/project/vendor/bundle --retry 3 --jobs 3
+    command: bundle install --path /home/circleci/project/vendor/bundle --retry 3 --jobs 3
 
 .install_chromedriver: &install_chromedriver
   run:
@@ -38,6 +38,28 @@ version: 2.1
     name: Create test app
     command: PARALLEL_TEST_PROCESSORS=4 bundle exec rake setup
 
+.restore_coverage: &restore_coverage
+  attach_workspace:
+    at: tmp
+
+.format_coverage: &format_coverage
+  run:
+    name: Format coverage
+    command: tmp/test-reporter format-coverage --input-type simplecov --output tmp/codeclimate.$CIRCLE_JOB.json
+
+.save_coverage: &save_coverage
+  persist_to_workspace:
+      root: tmp
+      paths:
+        - codeclimate.*.json
+
+.submit_coverage: &submit_coverage
+  run:
+    name: Upload coverage results to Code Climate
+    command: |
+      tmp/test-reporter sum-coverage tmp/codeclimate.*.json --parts 21 --output tmp/codeclimate.total.json
+      tmp/test-reporter upload-coverage --input tmp/codeclimate.total.json
+
 .save_test_app_to_workspace: &save_test_app_to_workspace
   persist_to_workspace:
     root: spec/rails
@@ -76,6 +98,11 @@ version: 2.1
     name: Run lints
     command: bundle exec rake lint
 
+.run_bug_report_template: &run_bug_report_template
+  run:
+    name: Run bug report template
+    command: ACTIVE_ADMIN_PATH=. ruby lib/bug_report_templates/active_admin_master.rb
+
 .test_steps: &test_steps
   - checkout
   - *install_bundler
@@ -86,7 +113,10 @@ version: 2.1
   - *save_cache
   - *restore_test_app_from_workspace
   - *restore_test_times
+  - *restore_coverage
   - *run_tests
+  - *format_coverage
+  - *save_coverage
   - *save_test_times
 
 .test_app_steps: &test_app_steps
@@ -100,6 +130,33 @@ version: 2.1
   - *save_test_app_to_workspace
 
 jobs:
+  setup_coverage:
+    docker:
+      - image: circleci/ruby:2.5.3
+
+    steps:
+      - run:
+          name: Download Code Climate test-reporter
+          command: |
+            mkdir tmp
+            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-0.6.3-linux-amd64 > tmp/test-reporter
+            chmod +x tmp/test-reporter
+
+      - persist_to_workspace:
+          root: tmp
+          paths:
+            - test-reporter
+
+  upload_coverage:
+    docker:
+      - image: circleci/ruby:2.5.3
+        environment:
+          CC_TEST_REPORTER_ID: 8d5fcf7abea6d56c625104a9d1a81140a588a7f546f4fa9de9bc6ffc8feaaf70
+
+    steps:
+      - *restore_coverage
+      - *submit_coverage
+
   testapp42:
     docker:
       - image: circleci/ruby:2.5.3-node
@@ -142,7 +199,7 @@ jobs:
 
   lint_and_docs:
     docker:
-      - image: circleci/ruby:2.5.3
+      - image: circleci/ruby:2.5.3-node
 
     environment:
       BUNDLE_GEMFILE: Gemfile
@@ -155,7 +212,11 @@ jobs:
       - *install_dependencies
       - *save_cache
       - *generate_docs
+      - *restore_coverage
       - *run_lints
+      - *run_bug_report_template
+      - *format_coverage
+      - *save_coverage
 
   ruby23rails42:
     docker:
@@ -379,12 +440,27 @@ workflows:
   #
   build:
     jobs:
-      - lint_and_docs
+      - setup_coverage
+
+      - lint_and_docs:
+          requires:
+            - setup_coverage
+
+      - testapp42:
+          requires:
+            - setup_coverage
+
+      - testapp50:
+          requires:
+            - setup_coverage
+
+      - testapp51:
+          requires:
+            - setup_coverage
 
-      - testapp42
-      - testapp50
-      - testapp51
-      - testapp52
+      - testapp52:
+          requires:
+            - setup_coverage
 
       - ruby23rails42:
           requires:
@@ -465,3 +541,32 @@ workflows:
       - jruby92rails52:
           requires:
             - testapp52
+
+      - upload_coverage:
+          requires:
+            - lint_and_docs
+
+            - ruby23rails42
+            - ruby23rails50
+            - ruby23rails51
+            - ruby23rails52
+
+            - ruby24rails42
+            - ruby24rails50
+            - ruby24rails51
+            - ruby24rails52
+
+            - ruby25rails42
+            - ruby25rails50
+            - ruby25rails51
+            - ruby25rails52
+
+            - jruby91rails42
+            - jruby91rails50
+            - jruby91rails51
+            - jruby91rails52
+
+            - jruby92rails42
+            - jruby92rails50
+            - jruby92rails51
+            - jruby92rails52

data/.gitignore

@@ -1,46 +1,16 @@
-## Mac
-.DS_Store
-
-## Windows
-.Thumbs.db
-
-## TextMate
-*.tm_project
-*.tmproj
-tmtags
-
-## Emacs
-*~
-\#*
-.\#*
-
-## Vim
-*.swp
-# IDEA / RUBYMINE
-.idea
-
-## RVM
-.rvmrc
-.ruby-version
-.ruby-gemset
-
 ## Project (general)
-tags
 tmp
 coverage
-rdoc
-doc
 .yardoc
+.ruby-version
 pkg
 
 ## Project (specific)
 .bundle
 spec/rails
-*.sqlite3-journal
 .test-rails-apps
 public
 .rspec_failures
 .rails-version
 .rbenv-version
-.localeapp/*
 lib/bug_report_templates/tmp

data/.rubocop.yml

@@ -4,6 +4,8 @@ inherit_mode:
   merge:
     - Include
 
+require: rubocop-rspec
+
 AllCops:
   DisabledByDefault: true
   TargetRubyVersion: 2.3
@@ -48,6 +50,9 @@ Layout/EndOfLine:
 Layout/ExtraSpacing:
   Enabled: true
 
+RSpec/HookArgument:
+  Enabled: true
+
 Style/Encoding:
   Enabled: true
 

data/.simplecov

@@ -3,9 +3,7 @@ SimpleCov.start do
 end
 
 if ENV['CI'] == 'true'
-  require 'codecov'
   SimpleCov.formatters = [
-    SimpleCov::Formatter::HTMLFormatter,
-    SimpleCov::Formatter::Codecov
+    SimpleCov::Formatter::HTMLFormatter
   ]
 end

data/CHANGELOG.md

@@ -2,17 +2,24 @@
 
 ## Unreleased
 
+## 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)
 
 ### Bug Fixes
 
-* Fix `input_html` filter option evaluated only once. [#5376][] by [@kjeldahl][]
+* 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)
 
 ### Bug Fixes
 
-* Fix menu item link with method delete. [#5583][] by [@tiagotex][]
+* 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)
 
@@ -20,38 +27,38 @@
 
 #### Minor
 
-* Add missing I18n for comments. [#5458][], [#5461][] by [@mauriciopasquier][]
-* Fix batch_actions.delete_confirmation translation in zh-CN.yml. [#5453][] by [@ShallmentMo][]
-* Add some missing italian translations. [#5433][] by [@stefsava][]
-* Enhance some chinese translations. [#5413][] by [@shouya][]
-* Add missing filter predicate translations to nb. [#5357][] by [@rogerkk][]
-* Add missing norwegian comment translations. [#5375][] by [@rogerkk][]
-* Add missing dutch translations. [#5368][] by [@dennisvdvliet][]
-* Add missing german translations. [#5341][] by [@eikes][]
-* Add missing spanish translation. [#5336][] by [@mconiglio][]
-* Add from and to predicates for russian language. [#5330][] by [@glebtv][]
-* Fix typo in finnish translation. [#5320][] by [@JiiHu][]
-* Add missing turkish translations. [#5295][] by [@kobeumut][]
-* Add missing chinese translations. [#5266][] by [@jasl][]
-* Allow proc label in datepicker input. [#5408][] by [@tiagotex][]
-* Add `group` attribute to scopes in order to show them in grouped. [#5359][] by [@leio10][]
-* Add missing polish translations and improve existing ones. [#5537][] by [@Wowu][]
-* Add `priority` option to `action_item`. [#5334][] by [@andreslemik][]
+* Add missing I18n for comments. [#5458], [#5461] by [@mauriciopasquier]
+* Fix batch_actions.delete_confirmation translation in zh-CN.yml. [#5453] by [@ShallmentMo]
+* Add some missing italian translations. [#5433] by [@stefsava]
+* Enhance some chinese translations. [#5413] by [@shouya]
+* Add missing filter predicate translations to nb. [#5357] by [@rogerkk]
+* Add missing norwegian comment translations. [#5375] by [@rogerkk]
+* Add missing dutch translations. [#5368] by [@dennisvdvliet]
+* Add missing german translations. [#5341] by [@eikes]
+* Add missing spanish translation. [#5336] by [@mconiglio]
+* Add from and to predicates for russian language. [#5330] by [@glebtv]
+* Fix typo in finnish translation. [#5320] by [@JiiHu]
+* Add missing turkish translations. [#5295] by [@kobeumut]
+* Add missing chinese translations. [#5266] by [@jasl]
+* Allow proc label in datepicker input. [#5408] by [@tiagotex]
+* Add `group` attribute to scopes in order to show them in grouped. [#5359] by [@leio10]
+* Add missing polish translations and improve existing ones. [#5537] by [@Wowu]
+* Add `priority` option to `action_item`. [#5334] by [@andreslemik]
 
 ### Bug Fixes
 
-* Fixed the string representation of the resolved `sort_key` when no explicit `sortable` attribute is passed. [#5464][] by [@chumakoff][]
-* Fixed docs on the column `sortable` attribute (which actually doesn't have to be explicitly specified when a block is passed to column). [#5464][] by [@chumakoff][]
-* Fixed `if:` scope option when a lambda is passed. [#5501][] by [@deivid-rodriguez][]
-* Comment validation adding redundant errors when resource is missing. [#5517][] by [@deivid-rodriguez][]
-* Fixed resource filtering by association when the resource has custom primary key. [#5446][] by [@wasifhossain][]
-* Fixed "create anoter" checkbox styling. [#5324][] by [@faucct][]
+* Fixed the string representation of the resolved `sort_key` when no explicit `sortable` attribute is passed. [#5464] by [@chumakoff]
+* Fixed docs on the column `sortable` attribute (which actually doesn't have to be explicitly specified when a block is passed to column). [#5464] by [@chumakoff]
+* Fixed `if:` scope option when a lambda is passed. [#5501] by [@deivid-rodriguez]
+* Comment validation adding redundant errors when resource is missing. [#5517] by [@deivid-rodriguez]
+* 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)
 
 ### Bug Fixes
 
-* gemspec should have more permissive ransack dependency. [#5448][] by [@varyonic][]
+* 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)
 
@@ -59,13 +66,13 @@
 
 #### Major
 
-* Rails 5.2 support [#5343][] by [@varyonic][], [#5399][], [#5401][] by [@zorab47][]
+* 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)
 
 ### Bug Fixes
 
-* Resolve issue with [#5275][] preventing XSS in filters sidebar. [#5299][] by [@faucct][]
+* 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)
 
@@ -73,41 +80,41 @@
 
 #### Minor
 
-* Do not display pagination info when there are no comments. [#5119][] by [@alex-bogomolov][]
-* Revert generated config files to pluralized. [#5120][] by [@varyonic][], [#5137][] by [@deivid-rodriguez][]
-* Warn when action definition overwrites controller method. [#5167][] by [@aarek][]
-* Better performance of comments show view. [#5208][] by [@dhyegofernando][]
-* Mitigate memory bloat [#4118][] with CSV exports. [#5251][] by [@f1sherman][]
-* Fix issue applying custom decorations. [#5253][] by [@faucct][]
-* Brazilian locale updated. [#5125][] by [@renotocn][]
-* Japanese locale updated. [#5143][] by [@5t111111][], [#5157][] by [@innparusu95][]
-* Italian locale updated. [#5180][] by [@blocknotes][]
-* Swedish locale updated. [#5187][] by [@jawa][]
-* Vietnamese locale updated. [#5194][] by [@Nguyenanh][]
-* Esperanto locale added. [#5210][] by [@RobinvanderVliet][]
+* Do not display pagination info when there are no comments. [#5119] by [@alex-bogomolov]
+* Revert generated config files to pluralized. [#5120] by [@varyonic], [#5137] by [@deivid-rodriguez]
+* Warn when action definition overwrites controller method. [#5167] by [@aarek]
+* Better performance of comments show view. [#5208] by [@dhyegofernando]
+* Mitigate memory bloat [#4118] with CSV exports. [#5251] by [@f1sherman]
+* Fix issue applying custom decorations. [#5253] by [@faucct]
+* Brazilian locale updated. [#5125] by [@renotocn]
+* Japanese locale updated. [#5143] by [@5t111111], [#5157] by [@innparusu95]
+* Italian locale updated. [#5180] by [@blocknotes]
+* Swedish locale updated. [#5187] by [@jawa]
+* Vietnamese locale updated. [#5194] by [@Nguyenanh]
+* Esperanto locale added. [#5210] by [@RobinvanderVliet]
 
 ### Bug Fixes
 
-* Fix a couple of issues rendering filter labels. [#5223][] by [@wspurgin][]
-* Prevent NameError when filtering on a namespaced association. [#5240][] by [@DanielHeath][]
-* Fix undefined method error in Ransack when building filters. [#5238][] by [@wspurgin][]
-* Fixed [#5198][] Prevent XSS on sidebar's current filter rendering. [#5275][] by [@deivid-rodriguez][]
-* Sanitize display_name. [#5284][] by [@markstory][]
+* Fix a couple of issues rendering filter labels. [#5223] by [@wspurgin]
+* Prevent NameError when filtering on a namespaced association. [#5240] by [@DanielHeath]
+* Fix undefined method error in Ransack when building filters. [#5238] by [@wspurgin]
+* 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)
 
 ### Bug Fixes
 
-* Fixed [#5093][] Handle table prefix & table suffix for `ActiveAdminComment` model
-* Fixed [#4173][] by including the default Kaminari templates. [#5069][] by [@javierjulio][]
-* Fixed [#5043][]. Do not crash in sidebar rendering when a default scope is not specified. [#5044][] by [@Fivell][]
-* Fixed [#3894][]. Make tab's component work with non-ascii titles. [#5046][] by [@Fivell][]
+* Fixed [#5093] Handle table prefix & table suffix for `ActiveAdminComment` model
+* Fixed [#4173] by including the default Kaminari templates. [#5069] by [@javierjulio]
+* Fixed [#5043]. Do not crash in sidebar rendering when a default scope is not specified. [#5044] by [@Fivell]
+* Fixed [#3894]. Make tab's component work with non-ascii titles. [#5046] by [@Fivell]
 
 ### Removals
 
-* Ruby 2.1 support has been dropped. [#5003][] by [@deivid-rodriguez][]
-* Replaced `sass-rails` with `sass` dependency. [#5037][] by [@javierjulio][]
-* Removed `jquery-ui-rails` as a dependency. [#5052][] by [@javierjulio][]
+* Ruby 2.1 support has been dropped. [#5003] by [@deivid-rodriguez]
+* Replaced `sass-rails` with `sass` dependency. [#5037] by [@javierjulio]
+* Removed `jquery-ui-rails` as a dependency. [#5052] by [@javierjulio]
   The specific jQuery UI assets used are now within the vendor directory. This
   will be replaced by alternatives and dropped entirely in a major release.
   Please remove any direct inclusions of `//= require jquery-ui`. This allows us
@@ -115,134 +122,134 @@
 
 ### Deprecations
 
-* Deprecated `config.register_stylesheet` and `config.register_javascript`. Import your CSS and JS files in `active_admin.scss` or `active_admin.js`. [#5060][] by [@javierjulio][]
-* Deprecated `type` param from `status_tag` and related CSS classes [#4989][] by [@javierjulio][]
-  * The method signature has changed from:
+* Deprecated `config.register_stylesheet` and `config.register_javascript`. Import your CSS and JS files in `active_admin.scss` or `active_admin.js`. [#5060] by [@javierjulio]
+* Deprecated `type` param from `status_tag` and related CSS classes [#4989] by [@javierjulio]
+  The method signature has changed from:
 
-    ```ruby
-    status_tag(status, :ok, class: 'completed', label: 'on')
-    ```
+  ```ruby
+  status_tag(status, :ok, class: 'completed', label: 'on')
+  ```
 
-    to:
+  to:
 
-    ```ruby
-    status_tag(status, class: 'completed ok', label: 'on')
-    ```
+  ```ruby
+  status_tag(status, class: 'completed ok', label: 'on')
+  ```
 
-  * The following CSS classes have been deprecated and will be removed in the future:
+  The following CSS classes have been deprecated and will be removed in the future:
 
-    ```css
-    .status_tag {
-      &.ok, &.published, &.complete, &.completed, &.green { background: #8daa92; }
-      &.warn, &.warning, &.orange { background: #e29b20; }
-      &.error, &.errored, &.red { background: #d45f53; }
-    }
-    ```
+  ```css
+  .status_tag {
+    &.ok, &.published, &.complete, &.completed, &.green { background: #8daa92; }
+    &.warn, &.warning, &.orange { background: #e29b20; }
+    &.error, &.errored, &.red { background: #d45f53; }
+  }
+  ```
 
 ### Enhancements
 
 #### Minor
 
-* Support proc as an input_html option value when declaring filters. [#5029][] by [@Fivell][]
-* Base localization support, better associations handling for active filters sidebar. [#4951][] by [@Fivell][]
-* Allow AA scopes to return paginated collections. [#4996][] by [@Fivell][]
-* Added `scopes_show_count` configuration to  setup show_count attribute for scopes globally. [#4950][] by [@Fivell][]
-* Allow custom panel title given with `attributes_table`. [#4940][] by [@ajw725][]
-* Allow passing a class to `action_item` block. [#4997][] by [@Fivell][]
-* Add pagination to the comments section. [#5088][] by [@alex-bogomolov][]
+* Support proc as an input_html option value when declaring filters. [#5029] by [@Fivell]
+* Base localization support, better associations handling for active filters sidebar. [#4951] by [@Fivell]
+* Allow AA scopes to return paginated collections. [#4996] by [@Fivell]
+* Added `scopes_show_count` configuration to  setup show_count attribute for scopes globally. [#4950] by [@Fivell]
+* Allow custom panel title given with `attributes_table`. [#4940] by [@ajw725]
+* 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...master)
+## 1.0.0 [☰](https://github.com/activeadmin/activeadmin/compare/v0.6.3...v1.0.0)
 
 ### Breaking Changes
 
-* Rename `allow_comments` to `comments` for more consistent naming. [#3695][] by [@pranas][]
-* JavaScript `window.AA` has been removed, use `window.ActiveAdmin`. [#3606][] by [@timoschilling][]
-* `f.form_buffers` has been removed. [#3486][] by [@varyonic][]
-* Iconic has been removed. [#3553][] by [@timoschilling][]
-* `config.show_comments_in_menu` has been removed, see `config.comments_menu`. [#4187][] by [@drn][]
-* Rails 3.2 & Ruby 1.9.3 support has been dropped. [#4848][] by [@deivid-rodriguez][]
-* Ruby 2.0.0 support has been dropped. [#4851][] by [@deivid-rodriguez][]
-* Rails 4.0 & 4.1 support has been dropped. [#4870][] by [@deivid-rodriguez][]
+* Rename `allow_comments` to `comments` for more consistent naming. [#3695] by [@pranas]
+* JavaScript `window.AA` has been removed, use `window.ActiveAdmin`. [#3606] by [@timoschilling]
+* `f.form_buffers` has been removed. [#3486] by [@varyonic]
+* Iconic has been removed. [#3553] by [@timoschilling]
+* `config.show_comments_in_menu` has been removed, see `config.comments_menu`. [#4187] by [@drn]
+* Rails 3.2 & Ruby 1.9.3 support has been dropped. [#4848] by [@deivid-rodriguez]
+* Ruby 2.0.0 support has been dropped. [#4851] by [@deivid-rodriguez]
+* Rails 4.0 & 4.1 support has been dropped. [#4870] by [@deivid-rodriguez]
 
 ### Enhancements
 
 #### Major
 
-* Migration from Metasearch to Ransack. [#1979][] by [@seanlinsley][]
-* Rails 4 support. [#2326][] by many people :heart:
-* Rails 4.2 support. [#3731][] by [@gonzedge][] and [@timoschilling][]
-* Rails 5 support. [#4254][] by [@seanlinsley][]
-* Rails 5.1 support. [#4882][] by [@varyonic][]
+* Migration from Metasearch to Ransack. [#1979] by [@seanlinsley]
+* Rails 4 support. [#2326] by many people :heart:
+* Rails 4.2 support. [#3731] by [@gonzedge] and [@timoschilling]
+* Rails 5 support. [#4254] by [@seanlinsley]
+* Rails 5.1 support. [#4882] by [@varyonic]
 
 #### Minor
 
-* "Create another" checkbox for the new resource page. [#4477][] by [@bolshakov][]
-* 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][]
-* 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][]
-* Unify DSL for index `actions` and `actions dropdown: true`. [#3463][] by [@timoschilling][]
-* Add DSL method `includes` for `ActiveRecord::Relation#includes`. [#3464][] by [@timoschilling][]
-* BOM (byte order mark) configurable for CSV download. [#3519][] by [@timoschilling][]
-* Column block on table index is now sortable by default. [#3075][] by [@dmitry][]
-* Allow Arbre to be used inside ActiveAdmin forms. [#3486][] by [@varyonic][]
-* Make AA ORM-agnostic. [#2545][] by [@johnnyshields][]
-* Add multi-record support to `attributes_table_for`. [#2544][] by [@zorab47][]
-* Table CSS classes are now prefixed to prevent clashes. [#2532][] by [@TimPetricola][]
-* Allow Inherited Resources shorthand for redirection. [#2001][] by [@seanlinsley][]
-
-```ruby
-    controller do
-      # Redirects to index page instead of rendering updated resource
-      def update
-        update!{ collection_path }
-      end
+* "Create another" checkbox for the new resource page. [#4477] by [@bolshakov]
+* 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]
+* 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]
+* Unify DSL for index `actions` and `actions dropdown: true`. [#3463] by [@timoschilling]
+* Add DSL method `includes` for `ActiveRecord::Relation#includes`. [#3464] by [@timoschilling]
+* BOM (byte order mark) configurable for CSV download. [#3519] by [@timoschilling]
+* Column block on table index is now sortable by default. [#3075] by [@dmitry]
+* Allow Arbre to be used inside ActiveAdmin forms. [#3486] by [@varyonic]
+* Make AA ORM-agnostic. [#2545] by [@johnnyshields]
+* Add multi-record support to `attributes_table_for`. [#2544] by [@zorab47]
+* Table CSS classes are now prefixed to prevent clashes. [#2532] by [@TimPetricola]
+* Allow Inherited Resources shorthand for redirection. [#2001] by [@seanlinsley]
+
+  ```ruby
+  controller do
+    # Redirects to index page instead of rendering updated resource
+    def update
+      update!{ collection_path }
     end
-```
+  end
+  ```
 
-* Accept block for download links. [#2040][] by [@potatosalad][]
+* Accept block for download links. [#2040] by [@potatosalad]
 
-```ruby
-index download_links: ->{ can?(:view_all_download_links) || [:pdf] }
-```
+  ```ruby
+  index download_links: ->{ can?(:view_all_download_links) || [:pdf] }
+  ```
 
-* Comments menu can be customized via configuration passed to `config.comments_menu`. [#4187][] by [@drn][]
-* Added `config.route_options` to namespace to customize routes. [#4731][] by [@stereoscott[]]
+* Comments menu can be customized via configuration passed to `config.comments_menu`. [#4187] by [@drn]
+* Added `config.route_options` to namespace to customize routes. [#4731] by [@stereoscott]
 
 ### Security Fixes
 
-* Prevents access to formats that the user not permitted to see. [#4867][] by [@Fivell][] and [@timoschilling][]
-* Prevents potential DOS attack via Ruby symbols. [#1926][] by [@seanlinsley][]
+* Prevents access to formats that the user not permitted to see. [#4867] by [@Fivell] and [@timoschilling]
+* Prevents potential DOS attack via Ruby symbols. [#1926] by [@seanlinsley]
   * [this isn't an issue for those using Ruby >= 2.2](http://rubykaigi.org/2014/presentation/S-NarihiroNakamura)
 
 ### Bug Fixes
 
-* Fixes filters for `has_many :through` relationships. [#2541][] by [@shekibobo][]
-* "New" action item now only shows up on the index page. bf659bc by [@seanlinsley][]
-* Fixes comment creation bug with aliased resources. 9a082486 by [@seanlinsley][]
-* Fixes the deletion of `:if` and `:unless` from filters. [#2523][] by [@PChambino][]
+* Fixes filters for `has_many :through` relationships. [#2541] by [@shekibobo]
+* "New" action item now only shows up on the index page. bf659bc by [@seanlinsley]
+* Fixes comment creation bug with aliased resources. 9a082486 by [@seanlinsley]
+* Fixes the deletion of `:if` and `:unless` from filters. [#2523] by [@PChambino]
 
 ### Deprecations
 
-* `ActiveAdmin::Event` (`ActiveAdmin::EventDispatcher`). [#3435][] by [@timoschilling][]
+* `ActiveAdmin::Event` (`ActiveAdmin::EventDispatcher`). [#3435] by [@timoschilling]
   `ActiveAdmin::Event` will be removed in a future version, ActiveAdmin switched
   to use `ActiveSupport::Notifications`
   NOTE: The blog parameters has changed:
 
-```ruby
-ActiveSupport::Notifications.subscribe ActiveAdmin::Application::BeforeLoadEvent do |event, *args|
-  # some code
-end
+  ```ruby
+  ActiveSupport::Notifications.subscribe ActiveAdmin::Application::BeforeLoadEvent do |event, *args|
+    # some code
+  end
 
-ActiveSupport::Notifications.publish ActiveAdmin::Application::BeforeLoadEvent, "some data"
-```
+  ActiveSupport::Notifications.publish ActiveAdmin::Application::BeforeLoadEvent, "some data"
+  ```
 
 ## Previous Changes
 
-Please check [0-6-stable][] for previous changes.
+Please check [0-6-stable] for previous changes.
 
 [0-6-stable]: https://github.com/activeadmin/activeadmin/blob/0-6-stable/CHANGELOG.md
 
@@ -353,6 +360,7 @@ Please check [0-6-stable][] for previous changes.
 [#5517]: https://github.com/activeadmin/activeadmin/pull/5517
 [#5537]: https://github.com/activeadmin/activeadmin/pull/5537
 [#5583]: https://github.com/activeadmin/activeadmin/pull/5583
+[#5611]: https://github.com/activeadmin/activeadmin/pull/5611
 
 [@5t111111]: https://github.com/5t111111
 [@aarek]: https://github.com/aarek
@@ -361,6 +369,7 @@ Please check [0-6-stable][] for previous changes.
 [@andreslemik]: https://github.com/andreslemik
 [@blocknotes]: https://github.com/blocknotes
 [@bolshakov]: https://github.com/bolshakov
+[@buren]: https://github.com/buren
 [@chancancode]: https://github.com/chancancode
 [@chumakoff]: https://github.com/chumakoff
 [@craigmcnamara]: https://github.com/craigmcnamara
@@ -400,6 +409,7 @@ Please check [0-6-stable][] for previous changes.
 [@shekibobo]: https://github.com/shekibobo
 [@shouya]: https://github.com/shouya
 [@stefsava]: https://github.com/stefsava
+[@stereoscott]: https://github.com/stereoscott
 [@tiagotex]: https://github.com/tiagotex
 [@timoschilling]: https://github.com/timoschilling
 [@TimPetricola]: https://github.com/TimPetricola