Merge pull request activeadmin#4937 from activeadmin/release/1.0.0

timoschilling · web-flow · commit 19e92cef9f8e · 2017-04-25T12:01:56.000+02:00
Prepare to release.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,5 @@
 # Changelog
-## 1.0.0 [☰](https://github.com/activeadmin/activeadmin/compare/v0.6.3...master) (unreleased)
+## 1.0.0 [☰](https://github.com/activeadmin/activeadmin/compare/v0.6.3...master)
 
 ### Breaking Changes
 
diff --git a/README.md b/README.md
@@ -9,19 +9,6 @@
 [![Inch CI         ](http://inch-ci.org/github/activeadmin/activeadmin.svg?branch=master)       ](http://inch-ci.org/github/activeadmin/activeadmin)
 [![Gratipay Team   ](https://img.shields.io/gratipay/team/Active-Admin.svg)](https://gratipay.com/Active-Admin/)
 
-## State of the project
-
-1.0.0.pre5 is the last release to support Rails 3.2 and Ruby 2.0 or earlier.
-It is provided to help with upgrades to Rails 4 only.
-
-1.0.0.pre5 has support for Rails 5. The following Gemfile addition may be needed:
-
-```ruby
-gem 'inherited_resources', '~> 1.7'
-```
-
-1.0.0 will drop support for Rails 3.2 and Ruby 2.0 or earlier.
-
 ## Goals
 
 1. Enable developers to quickly create good-looking administration interfaces.
diff --git a/lib/active_admin/version.rb b/lib/active_admin/version.rb
@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '1.0.0.pre5'
+  VERSION = '1.0.0'
 end
