From eb4245dd17ba66c0551f3d4ed841b471bcf01b91 Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <terminale@gmail.com>
Date: Tue, 26 Aug 2014 20:08:49 +0000
Subject: [ActiveJob] TestCase

---
 activejob/lib/active_job/base.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'activejob/lib/active_job/base.rb')

diff --git a/activejob/lib/active_job/base.rb b/activejob/lib/active_job/base.rb
index d5ba253016..1b54786303 100644
--- a/activejob/lib/active_job/base.rb
+++ b/activejob/lib/active_job/base.rb
@@ -8,8 +8,7 @@ require 'active_job/logging'
 
 module ActiveJob
   class Base
-    extend QueueAdapter
-
+    include QueueAdapter
     include QueueName
     include Enqueuing
     include Execution
-- 
cgit v1.2.3


From 1e237b4e44b7de564c7d6b331dd2f2243c4113fd Mon Sep 17 00:00:00 2001
From: Cristian Bica <cristian.bica@gmail.com>
Date: Mon, 25 Aug 2014 17:34:50 +0300
Subject: Active Job refactoring

---
 activejob/lib/active_job/base.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'activejob/lib/active_job/base.rb')

diff --git a/activejob/lib/active_job/base.rb b/activejob/lib/active_job/base.rb
index 1b54786303..a3bec1f827 100644
--- a/activejob/lib/active_job/base.rb
+++ b/activejob/lib/active_job/base.rb
@@ -1,19 +1,19 @@
+require 'active_job/core'
 require 'active_job/queue_adapter'
 require 'active_job/queue_name'
 require 'active_job/enqueuing'
 require 'active_job/execution'
 require 'active_job/callbacks'
-require 'active_job/identifier'
 require 'active_job/logging'
 
 module ActiveJob
   class Base
+    include Core
     include QueueAdapter
     include QueueName
     include Enqueuing
     include Execution
     include Callbacks
-    include Identifier
     include Logging
 
     ActiveSupport.run_load_hooks(:active_job, self)
-- 
cgit v1.2.3