If you are passed an empty hash, then assign_attributes doesn't need to
do any work and can just return early. This should fix the failing Agile
Web Development tests.

Add note about database connection pool in postgres template

Onf of the sides can be nil and it will raise a Conversion error

add test_scoped_root_as_name

Add a CHANGELOG entry about Web Console inclusion

Include web-console in new projects Gemfile

Raising an error when nil is passed to update_attributes.

Conflicts:
	activerecord/CHANGELOG.md

test for regression introduced by https://github.com/rails/rails/pull/9155

Remove unused quoted_locking_column method.

Getting Started Guide: update RubyGems Guides link [ci skip]

Update references to wycats/thor to erikhuda/thor.

Bump bcrypt-ruby version to support Ruby 2.0 on Windows

[ci skip]

TypeError: superclass mismatch for class PostgreSQLAdapter

Changing Inheritance section leads to following error on JRuby

    TypeError: superclass mismatch for class PostgreSQLAdapter

After this change,
Jruby: The above error no longer appear. Tests are still failing but they do run. Progress!
MRI: No change, all green(tested by running take test_test_postgresql)

Thanks to Aditya Sanghi(@asanghi) for help

Adding documentation and tests to ``polymorphic_url`` and ``link_to``

Creating options for schema dumper.

Small refactoring changes to generators.

Conflicts:
	railties/lib/rails/generators/rails/controller/controller_generator.rb

Fix some edge cases for select with selected option

It is reload! in the class definition.

[ci skip]

[ci skip]

Ability to pass block to select form builder helper

[ci skip]

[ci skip]

Make AM::Dirty less dirty to plugin into AR or other library

Changelog entry for pr #11474

  Example:

    = select(report, "campaign_ids") do
      - available_campaigns.each do |c|
        %option{:data => {:tags => c.tags.to_json}, :value => c.id}= c.name

[ci skip] Add `null` type modifier in migrations.md.

Only output Server logs in Development

Right now when you start a server via `rails s`, the logger gets extended so that it logs to the file system and also to stdout. This extension behavior is not "intelligent" and if the default logger is already set to output to stdout, then the contents will be received twice.

To capture logs in accordance with http://www.12factor.net/logs some platforms require the logs to be sent to standard out. If a logger is set to stdout, and the server is started using `rails server` instead of another method (i.e. `thin start` etc.) then the app will produce double logs.

This PR fixes the issue by only extending the logger to standard out in the development environment. So that in production you don't get double logs like this:

```
ActionView::Template::Error (wrong number of arguments (5 for 4)):
    1: <% lang_index = 0 %>
    2: <div class="row">
    3:   <ul class="nav nav-tabs nav-stacked span2" data-tabs="tabs" id="repo-tabs">
    4:     <% repos.group_by(&:language).each do |lang, repos| %>
    5:       <% unless lang == nil %>
    6:         <li><a href="#<%= "#{lang.parameterize}#{lang.hash}" %>" data-toggle="tab"><%= lang %></a></li>
    7:       <% end -%>
  app/views/shared/_repos.html.erb:4:in `_app_views_shared__repos_html_erb___1685450633638247395_70300668607000'
  app/views/pages/index.html.erb:13:in `_app_views_pages_index_html_erb__2084723628308867770_70300687584880'

ActionView::Template::Error (wrong number of arguments (5 for 4)):
    1: <% lang_index = 0 %>
    2: <div class="row">
    3:   <ul class="nav nav-tabs nav-stacked span2" data-tabs="tabs" id="repo-tabs">
    4:     <% repos.group_by(&:language).each do |lang, repos| %>
    5:       <% unless lang == nil %>
    6:         <li><a href="#<%= "#{lang.parameterize}#{lang.hash}" %>" data-toggle="tab"><%= lang %></a></li>
    7:       <% end -%>
  app/views/shared/_repos.html.erb:4:in `_app_views_shared__repos_html_erb___1685450633638247395_70300668607000'
  app/views/pages/index.html.erb:13:in `_app_views_pages_index_html_erb__2084723628308867770_70300687584880'
```

ATP Railties. Opened against master in favor of #10999