Merge pull request #11474 from bogdan/time-with-zone-succ

Prevent server blow up when iterating over TimeWithZone Range
Merge pull request #9155 from bogdan/route-formatter

Rewrite Journey::Visitors::Formatter for performance
Fix link_to return value
The documentation is showing the link_to method as just returning
the contents of the url_for method. It should be returning an
"<a>" tag with the correct href set.
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
Merge pull request #11060 from schneems/schneems/multi-stdout-logging-master

Only output Server logs in Development
Merge pull request #12314 from JuanitoFatas/migrations

[ci skip] Add `null` type modifier in migrations.md.
Changelog entry for pr #11474
Ability to pass block to AV#select helper

  Example:

    = select(report, "campaign_ids") do
      - available_campaigns.each do |c|
        %option{:data => {:tags => c.tags.to_json}, :value => c.id}= c.name
Merge pull request #12321 from bogdan/time-with-zone-succ

Changelog entry for pr #11474
Merge pull request #10816 from bogdan/less-dirty-dirty

Make AM::Dirty less dirty to plugin into AR or other library
Document reset_changes since it is part of public API

[ci skip]
No need to abbreviate ActiveModel

[ci skip]
Merge pull request #11055 from bogdan/select-with-block

Ability to pass block to select form builder helper
Use ERB in the CHANGELOG [ci skip]
Expand select documentation to tell about the block

[ci skip]
Fix the documentation method.

It is reload! in the class definition.

[ci skip]
Fix some edge cases for AV `select` helper with `:selected` option
Merge pull request #12287 from bogdan/select-with-selected-option

Fix some edge cases for select with selected option
Merge pull request #12070 from wangjohn/small_refactors_to_generators

Small refactoring changes to generators.

Conflicts:
	railties/lib/rails/generators/rails/controller/controller_generator.rb
Merge pull request #11987 from wangjohn/schema_dumper_options

Creating options for schema dumper.