Merge e0fa04f into cc178ad

activeadmin · Aug 20, 2016 · aa9fd49 · aa9fd49
2 parents cc178ad + e0fa04f
commit aa9fd49
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,6 +20,7 @@ env:
     - RAILS=4.2.5
     - RAILS=5.0.0
   global:
+    - RUBY_DEP_GEM_SILENCE_WARNINGS=1
     - JRUBY_OPTS="-J-Xmx1024m --debug"
 matrix:
   fast_finish: true

diff --git a/Gemfile b/Gemfile
@@ -58,6 +58,7 @@ group :test do
   gem 'capybara'
   gem 'simplecov', require: false           # Test coverage generator. Go to /coverage/ after running tests
   gem 'coveralls', require: false           # Test coverage website. Go to https://coveralls.io
+  gem 'tins', '< 1.3.4', platforms: :ruby_19
   gem 'cucumber-rails', require: false
   gem 'cucumber', '1.3.20'
   gem 'database_cleaner'