aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml20
-rw-r--r--Gemfile2
2 files changed, 11 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml
index 2c27c6bab7..27400b98c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,26 +52,26 @@ env:
- "GEM=ac:integration"
rvm:
- - 2.2.7
- - 2.3.4
- - 2.4.1
+ - 2.2.8
+ - 2.3.5
+ - 2.4.2
- ruby-head
matrix:
include:
- - rvm: 2.4.1
+ - rvm: 2.4.2
env: "GEM=av:ujs"
- - rvm: 2.2.7
+ - rvm: 2.2.8
env: "GEM=aj:integration"
services:
- memcached
- rabbitmq
- - rvm: 2.3.4
+ - rvm: 2.3.5
env: "GEM=aj:integration"
services:
- memcached
- rabbitmq
- - rvm: 2.4.1
+ - rvm: 2.4.2
env: "GEM=aj:integration"
services:
- memcached
@@ -81,15 +81,15 @@ matrix:
services:
- memcached
- rabbitmq
- - rvm: 2.3.4
+ - rvm: 2.3.5
env:
- "GEM=ar:mysql2 MYSQL=mariadb"
addons:
mariadb: 10.2
- - rvm: 2.3.4
+ - rvm: 2.3.5
env:
- "GEM=ar:sqlite3_mem"
- - rvm: 2.3.4
+ - rvm: 2.3.5
env:
- "GEM=ar:postgresql POSTGRES=9.2"
addons:
diff --git a/Gemfile b/Gemfile
index abdba3909e..8a5f98eeea 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,7 +41,7 @@ gem "rubocop", ">= 0.47", require: false
gem "rb-inotify", github: "matthewd/rb-inotify", branch: "close-handling", require: false
# https://github.com/puma/puma/pull/1345
-gem "stopgap_13632", platforms: :mri if %w(2.2.7 2.3.4 2.4.1).include? RUBY_VERSION
+gem "stopgap_13632", platforms: :mri_22
group :doc do
gem "sdoc", github: "robin850/sdoc", branch: "upgrade"