From 4398b838eee6541a285808a72a990472b8b47abc Mon Sep 17 00:00:00 2001
From: Genadi Samokovarov <gsamokovarov@gmail.com>
Date: Fri, 10 Jul 2015 23:04:20 +0300
Subject: [PATCH] Change config.development_only default to close #150

Version 2.2.0 explicitly prevents test running with web-console enabled.
While, a saner default, it does break rails new for 4.2.3 and below.
Keep it off, until 4.2.4 is released, so we don't have broken tests by
default on rails new.
---
 CHANGELOG.markdown         | 7 ++++++-
 lib/web_console/railtie.rb | 4 ++++
 lib/web_console/version.rb | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
index 3a2d66c9..e7d6b745 100644
--- a/CHANGELOG.markdown
+++ b/CHANGELOG.markdown
@@ -2,15 +2,20 @@
 
 ## master (unreleased)
 
+## 2.2.1
+
+* [#150](https://github.com/rails/web-console/pull/150) Change config.development_only default until 4.2.4 is released.
+
 ## 2.2.0
 
 * [#140](https://github.com/rails/web-console/pull/140) Add the ability to close the console on each page ([@sh19910711])
 * [#135](https://github.com/rails/web-console/pull/135) Run the console only in development mode and raise warning in tests ([@frenesim])
+* [#134](https://github.com/rails/web-conscle/pull/134) Force development only web console by default ([@gsamokovarov])
+* [#123](https://github.com/rails/web-console/pull/123) Replace deprecated `alias_method_chain` with `alias_method` ([@jonatack])
 
 ## 2.1.3
 
 * Fix remote code execution vulnerability in Web Console. CVE-2015-3224.
-* [#123](https://github.com/rails/web-console/pull/123) Replace deprecated `alias_method_chain` with `alias_method` ([@jonatack])
 
 ## 2.1.2
 
diff --git a/lib/web_console/railtie.rb b/lib/web_console/railtie.rb
index 20a912e4..2f5a6ec9 100644
--- a/lib/web_console/railtie.rb
+++ b/lib/web_console/railtie.rb
@@ -5,6 +5,10 @@ class Railtie < ::Rails::Railtie
     config.web_console = ActiveSupport::OrderedOptions.new
     config.web_console.whitelisted_ips = %w( 127.0.0.1 ::1 )
 
+    # See rails/web-console#150 and rails/rails#20319. Revert when Ruby on
+    # Rails 4.2.4 is released.
+    config.web_console.development_only = false
+
     initializer 'web_console.initialize' do
       require 'web_console/extensions'
 
diff --git a/lib/web_console/version.rb b/lib/web_console/version.rb
index 6d1aa56b..ba016230 100644
--- a/lib/web_console/version.rb
+++ b/lib/web_console/version.rb
@@ -1,3 +1,3 @@
 module WebConsole
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end