From 0c232779ece1ff6bf9bce9d55c54ea19867a2170 Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <terminale@gmail.com>
Date: Tue, 12 Aug 2014 09:29:21 +0000
Subject: Remove activejob integration tests

---
 railties/lib/rails/all.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'railties')

diff --git a/railties/lib/rails/all.rb b/railties/lib/rails/all.rb
index 2e83c0fe14..45361fca83 100644
--- a/railties/lib/rails/all.rb
+++ b/railties/lib/rails/all.rb
@@ -5,6 +5,7 @@ require "rails"
   action_controller
   action_view
   action_mailer
+  active_job
   rails/test_unit
   sprockets
 ).each do |framework|
-- 
cgit v1.2.3


From b2cabb7aceac9e2db0a9cc4fea8a4ef50d4ea132 Mon Sep 17 00:00:00 2001
From: Cristian Bica <cristian.bica@gmail.com>
Date: Sat, 16 Aug 2014 01:31:39 +0300
Subject: Added docs for AJ::Callbacks; Added AJ to docs build map

---
 railties/lib/rails/api/task.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'railties')

diff --git a/railties/lib/rails/api/task.rb b/railties/lib/rails/api/task.rb
index 3e32576040..4d49244807 100644
--- a/railties/lib/rails/api/task.rb
+++ b/railties/lib/rails/api/task.rb
@@ -50,6 +50,13 @@ module Rails
           )
         },
 
+        'activejob' => {
+          :include => %w(
+            README.md
+            lib/active_job/**/*.rb
+          )
+        },
+
         'railties' => {
           :include => %w(
             README.rdoc
-- 
cgit v1.2.3


From 07ca1d3ab6a51635df5e84f70d00de5c8962457c Mon Sep 17 00:00:00 2001
From: Genadi Samokovarov <gsamokovarov@gmail.com>
Date: Mon, 18 Aug 2014 02:03:58 +0300
Subject: Lock web-console to 2.0.0.beta1 for the first 4.2 beta

The console on exception code isn't available on the stable releases
yet. Lock it for now, so the beta users get a sneak peak of the console
features.
---
 railties/lib/rails/generators/rails/app/templates/Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties')

diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index 8b51fda359..d6311829fa 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -31,7 +31,7 @@ group :development, :test do
   <%- end -%>
 
   # Access an IRB console on exceptions page and /console in development
-  gem 'web-console'
+  gem 'web-console', '2.0.0.beta1'
 <%- if spring_install? %>
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
-- 
cgit v1.2.3