From 398dd13f3a00d2024f5ff9c59caaa8eddee78fbe Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremykemper@gmail.com>
Date: Thu, 5 Mar 2015 11:50:46 -0700
Subject: [PATCH] Revert "Allow failures with Active Job"

Travis is green. Let's keep it that way rather than let AJ
languish as a second-class citizen.

This reverts commit 2a6b3e14cff61639978a55f47aea9ff4c8e72758.
---
 .travis.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4dc8e0ed08..0038668ae7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,7 @@ env:
   matrix:
     - "GEM=railties"
     - "GEM=ap"
-    - "GEM=aj"
-    - "GEM=am,amo,as,av"
+    - "GEM=am,amo,as,av,aj"
     - "GEM=ar:mysql"
     - "GEM=ar:mysql2"
     - "GEM=ar:sqlite3"
@@ -31,8 +30,6 @@ matrix:
     - rvm: ruby-head
     - rvm: rbx-2
     - rvm: jruby-head
-    - env: "GEM=aj"
-    - env: "GEM=aj:integration"
   fast_finish: true
 notifications:
   email: false