diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/commands/servers/lighttpd.rb | 1 | ||||
| -rw-r--r-- | railties/lib/commands/servers/webrick.rb | 3 | ||||
| -rw-r--r-- | railties/lib/webrick_server.rb | 4 |
4 files changed, 1 insertions, 9 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 0735f4a36a..38f0f470a9 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -10,8 +10,6 @@ * Don't detach or fork for script/server tailing [Nicholas Seckar] -* Added automatic browser launching on OS X when starting script/server [DHH] - * Changed all script/* to use #!/usr/bin/env ruby instead of hard-coded Ruby path. public/dispatcher.* still uses the hard-coded path for compatibility with web servers that don't have Ruby in path [DHH] * Force RAILS_ENV to be "test" when running tests, so that ENV["RAILS_ENV"] = "production" in config/environment.rb doesn't wreck havok [DHH] #2660 diff --git a/railties/lib/commands/servers/lighttpd.rb b/railties/lib/commands/servers/lighttpd.rb index 456c6e0e9e..a35bc984c7 100644 --- a/railties/lib/commands/servers/lighttpd.rb +++ b/railties/lib/commands/servers/lighttpd.rb @@ -52,6 +52,5 @@ else end trap(:INT) { exit } -Thread.new { sleep 0.5; `open http://0.0.0.0:#{port}` } if RUBY_PLATFORM =~ /darwin/ `lighttpd #{!detach ? "-D " : ""}-f #{config_file}` tail_thread.kill if tail_thread
\ No newline at end of file diff --git a/railties/lib/commands/servers/webrick.rb b/railties/lib/commands/servers/webrick.rb index d06e3309bd..db8e8b3d93 100644 --- a/railties/lib/commands/servers/webrick.rb +++ b/railties/lib/commands/servers/webrick.rb @@ -8,8 +8,7 @@ OPTIONS = { :server_root => File.expand_path(RAILS_ROOT + "/public/"), :server_type => WEBrick::SimpleServer, :charset => "UTF-8", - :mime_types => WEBrick::HTTPUtils::DefaultMimeTypes, - :open_in_browser => true + :mime_types => WEBrick::HTTPUtils::DefaultMimeTypes } ARGV.options do |opts| diff --git a/railties/lib/webrick_server.rb b/railties/lib/webrick_server.rb index 74d5c08488..f356eaf35e 100644 --- a/railties/lib/webrick_server.rb +++ b/railties/lib/webrick_server.rb @@ -66,10 +66,6 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet require File.join(@server_options[:server_root], "..", "config", "environment") unless defined?(RAILS_ROOT) require "dispatcher" - if options[:open_in_browser] && RUBY_PLATFORM =~ /darwin/ - Thread.new { sleep 0.5; `open http://#{options[:ip]}:#{options[:port]}` } - end - server.start end |