aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-12-05 15:01:16 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-12-05 15:01:16 -0200
commit19243f3d8c6ac6397a34ae7eb9dc9da368986a22 (patch)
tree6e49f723923a7b8b02babc28123626f0740bca03
parent350c42c92eb4831801c34cdbe1bd317048961195 (diff)
parent8275b65987e6ee6114463273485917e0c8db4397 (diff)
downloadrails-19243f3d8c6ac6397a34ae7eb9dc9da368986a22.tar.gz
rails-19243f3d8c6ac6397a34ae7eb9dc9da368986a22.tar.bz2
rails-19243f3d8c6ac6397a34ae7eb9dc9da368986a22.zip
Merge pull request #17934 from rubys/dev_webconsole
Use latest web-console when using --dev or --edge
-rw-r--r--railties/lib/rails/generators/app_base.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index f5ae600bd8..3ea50607a5 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -111,6 +111,7 @@ module Rails
jbuilder_gemfile_entry,
sdoc_gemfile_entry,
psych_gemfile_entry,
+ console_gemfile_entry,
@extra_entries].flatten.find_all(&@gem_filter)
end
@@ -261,6 +262,15 @@ module Rails
GemfileEntry.new('sdoc', '~> 0.4.0', comment, group: :doc)
end
+ def console_gemfile_entry
+ comment = 'Use Rails Console on the Browser'
+ if options.dev? || options.edge?
+ GemfileEntry.github 'web-console', 'rails/web-console', comment
+ else
+ []
+ end
+ end
+
def coffee_gemfile_entry
comment = 'Use CoffeeScript for .coffee assets and views'
if options.dev? || options.edge?