fixed a typo
Merge branch 'master' of github.com:lifo/docrails
Globalize has moved to a new repository

From (svenfuchs/globalize3) to (globalize/globalize)
Underscore in markdown should be escaped with backslash [ci skip]

In the absence of proper escaping the first link was getting messed up and remaining part of the sentence (2nd link) was not displayed in the rendered markdown on the website though it was displaying correctly in the repository markdown file.
Fix on-site markdown rendering [ci skip]
Remove Rdoc formatting from markdown [ci skip]

Use markdown formatting instead
Update security.md

Add escape character for correct rendering
Update contributing_to_ruby_on_rails.md

Escape hyphen
Typos. return -> returns. [ci skip]
Remove an extra period

As a side not, the period after etc is not always
needed http://en.wiktionary.org/wiki/etc
Merge branch 'master' of github.com:lifo/docrails
fixed typo mistake time_formats.rb -> date_formats.rb [ci skip]
Merge branch 'master' of github.com:rails/docrails
[ci skip] add `assets.raise_runtime_errors` flag

The flag will be used in multiple places to check for errors during runtime if enabled.

Source:  https://github.com/rails/sprockets-rails/pull/100
Create a blacklist to disallow mutator methods to be delegated to `Array`.

This change was necessary because the whitelist wouldn't work.
It would be painful for users trying to update their applications.

This blacklist intent to prevent odd bugs and confusion in code that call mutator
methods directely on the `Relation`.
Some assorted fixes for the 4.1 release notes:

* Added release notes for secrets.yml and mentioned it in the highlights
* Added release notes for Mailer previews and mentioned it in the highlights
* Added release notes for Module#concerning
* Removed mention for AV extraction from the highlights
* Rearranged the major features to put highlighted features first
* Various improvements and typo fixes

[ci skip]
Merge pull request #13346 from chancancode/release_notes_etc

Release notes fixes [ci skip]
Add changelog entries about secrets.yml and secrets.secret_key_base
Merge pull request #13314 from laurocaetano/blacklist_array_methods

Create a blacklist to disallow mutator methods to be delegated to Array

Conflicts:
	guides/source/upgrading_ruby_on_rails.md
CSRF protection from cross-origin <script> tags

Thanks to @homakov for sounding the alarm about JSONP-style data leaking