Backport activeadmin#5223, activeadmin#5240, and activeadmin#5238 to …

…1-1-stable
zorab47 · Dec 4, 2017 · 88168f0 · 88168f0
1 parent b4931d2
commit 88168f0
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## ## 1.1.1 [☰](https://github.com/activeadmin/activeadmin/compare/v1.1.0...v1.1.1) (unreleased)
+
+### 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][]
+
 ## ## 1.1.0 [☰](https://github.com/activeadmin/activeadmin/compare/v1.0.0...v1.1.0)
 
 ### Bug Fixes