Merge pull request #114 from activeadmin/cut_1.2.0

Cut 1.2.0.rc1

.travis.yml

@@ -1,13 +1,15 @@
 language: ruby
 sudo: false
-before_install: gem update --system 3.0.2
+before_install:
+ - gem update --system 3.0.3
+ - gem install bundler:2.0.1
 rvm:
  - 2.3.8
  - 2.4.5
- - 2.5.3
- - 2.6.0
+ - 2.5.5
+ - 2.6.2
  - jruby-9.1.17.0
- - jruby-9.2.5.0
+ - jruby-9.2.6.0
 branches:
  only:
  - master

CHANGELOG.md

@@ -2,7 +2,11 @@
 
 ## Master (unreleased)
 
-* Drop support for EOL'd rubies (under 2.3) by [@deivid-rodriguez][]
+## 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][]
+* Fix rendering `link_to` with a block in a arbre template. [#64][] by [@varyonic][]
+* Drop support for EOL'd rubies (under 2.3). [#78][] by [@deivid-rodriguez][]
 
 ## 1.1.1 [☰](https://github.com/activeadmin/arbre/compare/v1.1.0...v1.1.1)
 
@@ -66,6 +70,11 @@ Initial release and extraction from Active Admin
 [#40]: https://github.com/activeadmin/arbre/issues/40
 [#49]: https://github.com/activeadmin/arbre/issues/49
 [#59]: https://github.com/activeadmin/arbre/issues/59
+[#64]: https://github.com/activeadmin/arbre/pull/64
+[#78]: https://github.com/activeadmin/arbre/pull/78
+[#110]: https://github.com/activeadmin/arbre/pull/110
+
+[@aramvisser]: https://github.com/aramvisser
 [@LTe]: https://github.com/LTe
 [@OscarBarrett]: https://github.com/OscarBarrett
 [@alexesDev]: https://github.com/alexesDev
@@ -78,3 +87,4 @@ Initial release and extraction from Active Admin
 [@ramontayag]: https://github.com/ramontayag
 [@seanlinsley]: https://github.com/seanlinsley
 [@timoschilling]: https://github.com/timoschilling
+[@varyonic]: https://github.com/varyonic

Gemfile

@@ -13,6 +13,10 @@ group :tools do
  gem 'rubocop'
 end
 
+group :release do
+ gem 'chandler'
+end
+
 group :rails do
  gem 'rails', '>= 5.0.0.1' # fixes CVE-2016-6316
  gem 'rspec-rails'

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
  remote: .
  specs:
- arbre (1.1.1)
+ arbre (1.2.0.rc1)
  activesupport (>= 3.0.0)
 
 GEM
@@ -48,7 +48,7 @@ GEM
  i18n (>= 0.7, < 2)
  minitest (~> 5.1)
  tzinfo (~> 1.1)
- addressable (2.6.0)
+ addressable (2.5.2)
  public_suffix (>= 2.0.2, < 4.0)
  arel (9.0.0)
  ast (2.4.0)
@@ -61,6 +61,9 @@ GEM
  rack-test (>= 0.6.3)
  regexp_parser (~> 1.2)
  xpath (~> 3.2)
+ chandler (0.9.0)
+ netrc
+ octokit (>= 2.2.0)
  coderay (1.1.2)
  combustion (1.1.0)
  activesupport (>= 3.0.0)
@@ -70,6 +73,8 @@ GEM
  crass (1.0.4)
  diff-lcs (1.3)
  erubi (1.8.0)
+ faraday (0.15.4)
+ multipart-post (>= 1.2, < 3)
  ffi (1.9.25-java)
  globalid (0.4.2)
  activesupport (>= 4.2.0)
@@ -89,11 +94,15 @@ GEM
  mini_mime (1.0.1)
  mini_portile2 (2.4.0)
  minitest (5.11.3)
+ multipart-post (2.0.0)
+ netrc (0.11.0)
  nio4r (2.3.1)
  nio4r (2.3.1-java)
  nokogiri (1.10.1)
  mini_portile2 (~> 2.4.0)
  nokogiri (1.10.1-java)
+ octokit (4.13.0)
+ sawyer (~> 0.8.0, >= 0.5.3)
  parallel (1.13.0)
  parser (2.6.0.0)
  ast (~> 2.4.0)
@@ -166,6 +175,9 @@ GEM
  ruby-progressbar (~> 1.7)
  unicode-display_width (~> 1.4.0)
  ruby-progressbar (1.10.0)
+ sawyer (0.8.1)
+ addressable (>= 2.3.5, < 2.6)
+ faraday (~> 0.8, < 1.0)
  spoon (0.0.6)
  ffi
  sprockets (3.7.2)
@@ -196,6 +208,7 @@ PLATFORMS
 DEPENDENCIES
  arbre!
  capybara
+ chandler
  combustion
  pry
  rails (>= 5.0.0.1)
@@ -205,4 +218,4 @@ DEPENDENCIES
  rubocop
 
 BUNDLED WITH
- 1.17.1
+ 2.0.1

Rakefile

@@ -5,6 +5,7 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 import 'tasks/lint.rake'
+import 'tasks/release.rake'
 
 task default: [:spec, :lint]
 

lib/arbre/version.rb

@@ -1,3 +1,3 @@
 module Arbre
- VERSION = "1.1.1"
+ VERSION = "1.2.0.rc1"
 end

tasks/release.rake

@@ -0,0 +1,6 @@
+require "chandler/tasks"
+
+#
+# Add chandler as a prerequisite for `rake release`
+#
+task "release:rubygem_push" => "chandler:push"