Update CHANGELOG, bump version.

activeadmin · Jan 10, 2018 · f3bdb7c · f3bdb7c
1 parent 66950fe
commit f3bdb7c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 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)
 
 ### Enhancements
@@ -25,7 +31,7 @@
 * 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 [#5272][] by [@deivid-rodriguez][]
+* 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)

diff --git a/lib/active_admin/version.rb b/lib/active_admin/version.rb
@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end