aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-10-24 15:27:05 +0200
committerYves Senn <yves.senn@gmail.com>2015-10-24 15:27:05 +0200
commit6843cf6a94ae1efad0464381408a1c5f2f157376 (patch)
treefa71c69d4337c121d7c6a403e73c5b0c3c4c5d9d
parentdf153edcfb9030fb428e1363b969fba846ff14eb (diff)
parentdcb75834c34d9fc38f9edd17143af561c4e9eea6 (diff)
downloadrails-6843cf6a94ae1efad0464381408a1c5f2f157376.tar.gz
rails-6843cf6a94ae1efad0464381408a1c5f2f157376.tar.bz2
rails-6843cf6a94ae1efad0464381408a1c5f2f157376.zip
Merge pull request #22040 from arunagw/remove-jruby-travis-opts
Remove JRUBY_OPTS from .travis.yml file
-rw-r--r--.travis.yml2
1 files changed, 0 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 5d4a9e9c67..46be91d18e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,6 @@ before_script:
- bundle update
cache: bundler
env:
- global:
- - JRUBY_OPTS='-J-Xmx1024M'
matrix:
- "GEM=railties"
- "GEM=ap"