Skip to content

Commit caf306d

Browse files
authored
Merge pull request #17 from workgena/travis_active_admin_14
Update .travis.yml with ActiveAdmin 1.4.0 release
2 parents f5345be + 4c79610 commit caf306d

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
- RAILS=5.1.6 AA=1.1.0
1313
- RAILS=5.1.6 AA=1.2.1
1414
- RAILS=5.2.1 AA=1.3.1
15-
- RAILS=5.2.1 AA=1-4-stable
15+
- RAILS=5.2.1 AA=1.4.0
1616

1717
rvm:
1818
- 2.3

Gemfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ gemspec
55

66
group :test do
77
gem 'rails', "#{ENV['RAILS'] || '5.2.1'}"
8-
if ENV['AA'] == '1-4-stable'
9-
gem 'activeadmin', git: 'https://github.com/activeadmin/activeadmin.git', branch: '1-4-stable'
10-
else
11-
gem 'activeadmin', "#{ENV['AA'] || '1.3.1'}"
12-
end
8+
gem 'activeadmin', "#{ENV['AA'] || '1.3.1'}"
139

1410
gem 'rspec-rails'
1511
gem 'sqlite3'

0 commit comments

Comments
 (0)