Skip to content

Commit caee6cc

Browse files
committed
Update Gemfile
1 parent 3e3f28c commit caee6cc

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

Gemfile

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,26 @@ rails_major = rails_version[0]
99

1010
group :test do
1111
gem 'rails', rails_version
12-
if rails_major == '5'
13-
gem 'inherited_resources', github: 'activeadmin/inherited_resources'
14-
gem 'activeadmin', github: 'activeadmin/activeadmin'
15-
else
16-
gem 'activeadmin', '1.0.0.pre4'
17-
end
12+
gem 'inherited_resources', github: 'activeadmin/inherited_resources' if rails_major == '5'
13+
gem 'activeadmin', github: 'activeadmin/activeadmin', ref: 'd5638b33841cd6b0987f9086c7cd4e2b10982b88'
1814

1915
gem 'rspec-rails'
2016
gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
2117
gem 'sqlite3'
2218
gem 'launchy'
23-
gem 'pry'
2419
gem 'database_cleaner'
2520
gem 'capybara'
2621
gem 'poltergeist'
27-
gem 'selenium-webdriver', '< 3.0', platforms: :ruby_19
28-
gem 'json', '< 2.0', platforms: :ruby_19 # Json 2.0 requires Ruby >= 2.0
29-
gem 'mime-types', '< 3.0.0', platforms: [:ruby_19, :ruby_20]
30-
gem 'tins', '< 1.3.4', platforms: :ruby_19
31-
gem 'term-ansicolor', '< 1.4.0', platforms: :ruby_19
22+
gem 'jquery-ui-rails', '~> 5.0'
23+
24+
platform :ruby_19 do # Remove this block when we drop support for Ruby 1.9
25+
gem 'mime-types', '< 3'
26+
gem 'nokogiri', '< 1.7'
27+
gem 'public_suffix', '< 1.5'
28+
gem 'term-ansicolor', '< 1.4'
29+
gem 'tins', '< 1.3.4'
30+
gem 'selenium-webdriver', '< 3.0'
31+
end
32+
33+
3234
end

0 commit comments

Comments
 (0)