Merge pull request #489 from activeadmin/cut_1.10_final

Cut 1.10 final
activeadmin · Apr 3, 2019 · 2ba6982 · 2ba6982
2 parents ef943a6 + 867b3bf
commit 2ba6982
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 .bundle
+pkg
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Master (unreleased)
 
+# Version 1.10.0
+
+_No changes_.
+
 # Version 1.10.0.rc1
 
 * Preliminary support for Rails 6.0.

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    inherited_resources (1.10.0.rc1)
+    inherited_resources (1.10.0)
       actionpack (>= 5.0, < 6.0)
       has_scope (~> 0.6)
       railties (>= 5.0, < 6.0)

diff --git a/lib/inherited_resources/version.rb b/lib/inherited_resources/version.rb
@@ -1,3 +1,3 @@
 module InheritedResources
-  VERSION = '1.10.0.rc1'.freeze
+  VERSION = '1.10.0'.freeze
 end
diff --git a/test/gemfiles/Gemfile-Rails-5-0.lock b/test/gemfiles/Gemfile-Rails-5-0.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    inherited_resources (1.10.0.rc1)
+    inherited_resources (1.10.0)
       actionpack (>= 5.0, < 6.0)
       has_scope (~> 0.6)
       railties (>= 5.0, < 6.0)

diff --git a/test/gemfiles/Gemfile-Rails-5-1.lock b/test/gemfiles/Gemfile-Rails-5-1.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    inherited_resources (1.10.0.rc1)
+    inherited_resources (1.10.0)
       actionpack (>= 5.0, < 6.0)
       has_scope (~> 0.6)
       railties (>= 5.0, < 6.0)

diff --git a/test/gemfiles/Gemfile-Rails-6-0.lock b/test/gemfiles/Gemfile-Rails-6-0.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    inherited_resources (1.10.0.rc1)
+    inherited_resources (1.10.0)
       actionpack (>= 5.0, < 6.0)
       has_scope (~> 0.6)
       railties (>= 5.0, < 6.0)