Skip to content

Commit d5922a7

Browse files
authored
Merge pull request #139 from activeadmin-plugins/3.0.0
prepare 3.0.0
2 parents 30b6d71 + ad624c2 commit d5922a7

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

Gemfile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@ source 'https://rubygems.org'
33

44
# Specify your gem's dependencies in active_admin_importable.gemspec
55
gemspec
6-
default_rails_version = '4.2.6'
7-
rails_version = ENV['RAILS'] || default_rails_version
8-
rails_major = rails_version[0]
6+
97

108
group :test do
9+
default_rails_version = '4.2.8'
10+
rails_version = ENV['RAILS'] || default_rails_version
1111
gem 'rails', rails_version
12-
gem 'inherited_resources', github: 'activeadmin/inherited_resources' if rails_major == '5'
13-
gem 'activeadmin', github: 'activeadmin/activeadmin', ref: 'd5638b33841cd6b0987f9086c7cd4e2b10982b88'
14-
1512
gem 'rspec-rails'
1613
gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
1714
gem 'sqlite3'

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@ with support of validations, bulk inserts and encodings handling](http://activea
1111
[![Gem Version](http://img.shields.io/gem/v/active_admin_import.svg)](https://rubygems.org/gems/active_admin_import)
1212
[![License](http://img.shields.io/:license-mit-blue.svg)](http://Fivell.mit-license.org)
1313

14-
master can be used with AA 1.0.0 and Rails >= 4.1
1514

1615

1716
#Installation
1817

1918
Add this line to your application's Gemfile:
2019

2120
```ruby
22-
gem "active_admin_import" , '3.0.0.pre'
21+
gem "active_admin_import" , '3.0.0'
2322

2423
```
2524
or

active_admin_import.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ Gem::Specification.new do |gem|
1515
gem.name = 'active_admin_import'
1616
gem.require_paths = ['lib']
1717
gem.version = ActiveAdminImport::VERSION
18-
gem.add_runtime_dependency 'activerecord-import', '>= 0.16.1'
18+
gem.add_runtime_dependency 'activerecord-import', '~> 0.17.0'
1919
gem.add_runtime_dependency 'rchardet', '~> 1.6'
2020
gem.add_runtime_dependency 'rubyzip', '~> 1.2'
21-
gem.add_dependency 'rails', '>= 4.0'
21+
gem.add_dependency 'activeadmin', '~> 1.0'
2222
end

lib/active_admin_import/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# frozen_string_literal: true
22
module ActiveAdminImport
3-
VERSION = '3.0.0.pre'
3+
VERSION = '3.0.0'
44
end

0 commit comments

Comments
 (0)