From 36edd084f277f21900a768a0384196b57d2931ee Mon Sep 17 00:00:00 2001 From: Sean Linsley Date: Wed, 20 Aug 2014 09:23:35 -0400 Subject: [PATCH] use Arbre 1.0.2 --- Gemfile | 2 -- activeadmin.gemspec | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 8bd65a535b9..312e56f5f77 100644 --- a/Gemfile +++ b/Gemfile @@ -7,8 +7,6 @@ require File.expand_path 'spec/support/detect_rails_version', File.dirname(__FIL rails_version = detect_rails_version gem 'rails', rails_version -gem 'arbre', github: 'activeadmin/arbre' # until activeadmin/arbre#16 makes it into an official release - # Optional dependencies gem 'cancan' gem 'devise' diff --git a/activeadmin.gemspec b/activeadmin.gemspec index 35489580b65..730a26d9061 100644 --- a/activeadmin.gemspec +++ b/activeadmin.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |s| s.files = `git ls-files`.split("\n").sort s.test_files = `git ls-files -- {spec,features}/*`.split("\n") - s.add_dependency 'arbre', '~> 1.0' + s.add_dependency 'arbre', '~> 1.0', '>= 1.0.2' s.add_dependency 'bourbon' s.add_dependency 'coffee-rails' s.add_dependency 'formtastic', '~> 2.3.0.rc3' # change to 2.3 when stable is released