Skip to content

Commit f59ebdd

Browse files
authored
Merge pull request #31 from activeadmin-plugins/travis-fix
update travis config
2 parents 0fc0f23 + ae608cb commit f59ebdd

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

.travis.yml

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
script: bundle exec rspec spec
22
env:
33
matrix:
4-
- RAILS=4.0.13
5-
- RAILS=4.1.5
64
- RAILS=4.2.6
5+
- RAILS=5.0.0
76
rvm:
8-
- 2.1.5
9-
- 2.2.0
10-
- 2.3.0
7+
- 2.2.6
8+
- 2.3.3
119
before_install:
12-
- gem install bundler -v '= 1.9.3'
1310
- gem update --system
11+
- rvm @global do gem uninstall bundler -a -x
12+
- rvm @global do gem install bundler -v 1.14.6
1413
- gem --version

Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ source 'https://rubygems.org'
33
# Specify your gem's dependencies in active_admin_datetimepicker.gemspec
44
gemspec
55
group :test do
6-
default_rails_version = '4.2.6'
6+
default_rails_version = '4.2.7'
77
gem 'sprockets-rails', '2.3.3'
88
gem 'rails', "#{ENV['RAILS'] || default_rails_version}"
99
gem 'rspec-rails'
10-
gem 'activeadmin', github: 'activeadmin' , ref: 'd787029e5523be2eb2ed99816eb0cecca2b72862'
10+
gem 'activeadmin', github: 'activeadmin', ref: '06aa8b2af692e46fc360832473ca63e23a70b3d4'
1111
gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
1212
gem 'sass-rails'
1313
gem 'sqlite3'

0 commit comments

Comments
 (0)