diff --git a/CHANGELOG.md b/CHANGELOG.md index 88b29d88..63c86cdd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Master (unreleased) +## 1.2.0 [☰](https://github.com/activeadmin/arbre/compare/v1.2.0.rc1...v1.2.0) + +_No changes_. + ## 1.2.0.rc1 [☰](https://github.com/activeadmin/arbre/compare/v1.1.1...v1.2.0.rc1) * Fix deprecation warning about single arity template handlers on Rails 6. [#110][] by [@aramvisser][] diff --git a/Gemfile.lock b/Gemfile.lock index 0c1627d5..df0f7ef7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - arbre (1.2.0.rc1) + arbre (1.2.0) activesupport (>= 3.0.0) GEM diff --git a/lib/arbre/version.rb b/lib/arbre/version.rb index 16c04755..bced7ca7 100644 --- a/lib/arbre/version.rb +++ b/lib/arbre/version.rb @@ -1,3 +1,3 @@ module Arbre - VERSION = "1.2.0.rc1" + VERSION = "1.2.0" end