rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #26168 from chuckdishmon/fix-plural-usage	Jon Moss	2016-08-14	1	-1/+1
\|\ \| \| \| \|	fix usage of pluralized word [ci skip]
\| *	fix usage of pluralized word	chuckdishmon	2016-08-14	1	-1/+1
\|/
*	Merge pull request #26166 from kamipo/fix_ar_fixtures_doc	Jon Moss	2016-08-14	1	-4/+4
\|\ \| \| \| \|	Fix `ActiveRecord::FixtureSet` docs [ci skip]
\| *	Fix `ActiveRecord::FixtureSet` docs [ci skip]	Ryuta Kamizono	2016-08-15	1	-4/+4
\|/ \| \| \| \| \| \|	`ActiveSupport::TestCase` was replaced `ActiveRecord::TestCase` in #26150. But this docs is for rails apps per se, it should be `ActiveSupport::TestCase`. See https://github.com/rails/rails/pull/26150#discussion_r74710989.
*	Revert "Clarify and fix typos in Autoloading Disabled upgrade guide [ci skip]"	Xavier Noria	2016-08-15	1	-12/+12
\| \| \| \| \| \|	Reason: See https://github.com/rails/rails/pull/26163#issuecomment-239703322 This reverts commit 39effc857e5c774670d6fad1a26aebcc33c51f0a.
*	Merge pull request #26150 from kamipo/consolidate_ar_test_case_and_as_test_case	Sean Griffin	2016-08-14	3	-21/+20
\|\ \| \| \| \|	Consolidate `ActiveRecord::TestCase` and `ActiveSupport::TestCase` in AR test cases
\| *	Consolidate `ActiveRecord::TestCase` and `ActiveSupport::TestCase` in AR ↵	Ryuta Kamizono	2016-08-14	3	-21/+20
\| \| \| \| \| \| \| \|	test cases
* \|	Pass along original attribute to save later recursion	Aaron Patterson	2016-08-14	2	-1/+8
\| \| \| \| \| \| \| \|	Fixes #26122
* \|	Merge pull request #26012 from grosser/grosser/missing	Sean Griffin	2016-08-14	1	-1/+1
\|\ \ \| \| \| \| \| \|	add more array methods to straight delegation to speed up calling them
\| * \|	add index to array methods so we can call it on relations	Michael Grosser	2016-08-12	1	-1/+1
\| \| \|
* \| \|	Merge pull request #26163 from olivierlacan/clarify-autoloading-disabled	Jon Moss	2016-08-14	1	-12/+12
\|\ \ \ \| \| \| \| \| \| \| \|	Clarify and fix typos in autoloading disabled section
\| * \| \|	Clarify and fix typos in Autoloading Disabled upgrade guide [ci skip]	Olivier Lacan	2016-08-14	1	-12/+12
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The Guides section about autoloading being disabled was slightly confusing (#24724) and didn't directly reference the removed feature by name (config.autoload_paths) making it much harder for someone to search the upgrade guides for a mention or serendipitously find it via a Google search when running into autoloading issues. I also fixed some confusing turns of phrase and a missing word. /cc @vipulnsward @jvanbaarsen
* \| \|	[ci skip] Link to the request helpers documentation.	Kasper Timm Hansen	2016-08-14	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's tough for people without the knowledge of where the `get` and friends integration test helpers are defined to find documentation for them. Add a link to the main integration test documentation.
* \| \|	[ci skip] Update integration test request encoding documentation.	Kasper Timm Hansen	2016-08-14	1	-13/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Give the section a header to distinguish it from the general doc. * Replace backticks with + signs to fit SDoc. * Use double quoted strings. * Clarify how `parsed_body` works — it doesn't depend on `as` anymore.
* \| \|	Merge pull request #26159 from prathamesh-sonpatki/fix-cache-logging-doc	Kasper Timm Hansen	2016-08-14	1	-8/+16
\|\ \ \ \| \|/ / \|/\| \|	Fix the documentation for configuring `enable_fragment_cache_logging`…
\| * \|	Fix the documentation for configuring `enable_fragment_cache_logging` [ci skip]	Prathamesh Sonpatki	2016-08-14	1	-8/+16
\|/ / \| \| \| \| \| \|	- It is Action Controller config, not Action View.
* \|	Merge pull request #26146 from bcardarella/bc-clean-up-action-mailer-dirs	Rafael França	2016-08-13	2	-0/+2
\|\ \ \| \| \| \| \| \|	Ensure app/mailers is removed when skipping action-mailer
\| * \|	Ensure app/mailers is removed when skipping action-mailer	Brian Cardarella	2016-08-12	2	-0/+2
\|/ / \| \| \| \| \| \|	Closes #26145
* \|	Merge pull request #25856 from mrageh/improve-lazy-load-hook-docs	Rafael França	2016-08-12	1	-0/+2
\|\ \ \| \| \| \| \| \|	Add documentation about `ActiveSupport.on_load`
\| * \|	Add documentation about `ActiveSupport.on_load`	mrageh	2016-08-13	1	-0/+2
\|/ / \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] This commit adds some docs that explain how `LazyLoadHooks.on_load` method works.
* \|	Merge pull request #26113 from kamipo/use_ar_test_case_instead_of_as_test_case	Rafael França	2016-08-12	2	-2/+2
\|\ \ \| \| \| \| \| \|	Use `ActiveRecord::TestCase` rather than `ActiveSupport::TestCase` in AR test cases
\| * \|	Use `ActiveRecord::TestCase` rather than `ActiveSupport::TestCase` in AR ↵	Ryuta Kamizono	2016-08-11	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	test cases
* \| \|	Merge pull request #26143 from nathanl/self-explanatory-cache-durations	Rafael França	2016-08-12	2	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \|	Make cache max-age durations self-explanatory
\| * \| \|	Make cache max-age durations self-explanatory	Nathan Long	2016-08-12	2	-2/+2
\| \| \| \|
* \| \| \|	Merge pull request #26100 from vipulnsward/changelogs	Rafael França	2016-08-12	6	-13/+16
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Pass over changelogs
\| * \| \| \|	Pass over changelogs [ci skip]	Vipul A M	2016-08-10	6	-13/+16
\| \| \| \| \|
* \| \| \| \|	Make private method private	Rafael Mendonça França	2016-08-12	1	-11/+11
\| \| \| \| \|
* \| \| \| \|	Mark method as nodoc	Rafael Mendonça França	2016-08-12	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	They are not part of the public API
* \| \| \| \|	Merge pull request #26144 from javierjulio/patch-1	Jon Moss	2016-08-12	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	Update example in Http::Headers object to use `.from_hash`
\| * \| \| \|	Given a hash (Rails 5) .from_hash must be used	Javier Julio	2016-08-12	1	-1/+1
\|/ / / / \| \| \| \| \| \| \| \|	When initializing an `ActionDispatch::Http::Headers` object it takes a request object (Rails 5) whereas before it took a hash (Rails 4.x) but the documented example still shows a hash given to the constructor (due to commit 34fa6658dd1b779b21e586f01ee64c6f59ca1537) so this is just a documentation change to use the new `from_hash` method introduced in that earlier commit.
* \| \| \|	Merge pull request #26133 from smellsblue/dont-fail-on-non-string	Rafael França	2016-08-12	2	-1/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Ensure values are strings before calling gsub
\| * \| \| \|	Ensure values are strings before calling gsub	Mike Virata-Stone	2016-08-12	2	-1/+9
\|/ / / /
* \| \| \|	Merge pull request #26125 from qinix/fix-doc	Jon Moss	2016-08-11	1	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	[ci skip] Fix the wrong ActionCable documentation in the guide.
\| * \| \| \|	[ci skip] Fix documentation wrong for ActionCable	Eric Zhang	2016-08-12	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	[ci skip] Fix documentation for ActionCable::Channel#broadcast_to	Eric Zhang	2016-08-12	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge pull request #26118 from alexcameron89/param-encoding-documentation	Jon Moss	2016-08-11	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Add documentation to Parameter Encoding
\| * \| \| \| \|	[ci skip] Add documentation to Parameter Encoding	Alex Kitchens	2016-08-11	1	-0/+1
\| \|/ / / /
* \| \| \| \|	Integration test to prevent regression for the 5th time	Aaron Patterson	2016-08-11	1	-0/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix unsafe query generation risk. Redo of CVE-2012-2660, CVE-2012-2694 and CVE-2013-0155 CVE-2016-6317
* \| \| \| \|	Merge pull request #26124 from yahonda/diag26099	Sean Griffin	2016-08-11	1	-4/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Creating a new Topic class instead of class_eval for the existing one
\| * \| \| \| \|	Creating a new Topic class instead of class_eval for the existing one	Yasuo Honda	2016-08-11	1	-4/+2
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	since it affects another test `ReflectionTest#test_read_attribute_names` Address #26099
* \| \| \| \|	Merge pull request #26090 from kamipo/fix_warning_ambiguous_first_argument	Sean Griffin	2016-08-11	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix warning: ambiguous first argument
\| * \| \| \| \|	Fix warning: ambiguous first argument	Ryuta Kamizono	2016-08-12	1	-1/+1
\|/ / / / /
* / / / /	ensure tag/content_tag escapes " in attribute vals	Andrew Carpenter	2016-08-11	2	-1/+11
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Many helpers mark content as HTML-safe without escaping double quotes -- including `sanitize`. Regardless of whether or not the attribute values are HTML-escaped, we want to be sure they don't include double quotes, as that can cause XSS issues. For example: `content_tag(:div, "foo", title: sanitize('" onmouseover="alert(1);//'))` CVE-2016-6316
* \| \| \|	Merge pull request #26116 from y-yagi/fix_name_error_in_engine_commands_tasks	Kasper Timm Hansen	2016-08-11	2	-0/+26
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	add missing require rake
\| * \| \|	add missing require rake	yuuji.yaginuma	2016-08-11	2	-0/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In ff8035dfeed8c86594c32ef8e9204806e190cb58, require rake is deferred. Therefore, it is necessary to require rake even `Engine::CommandsTasks.
* \| \| \|	Merge pull request #26114 from kamipo/fix_test_failure	Kasper Timm Hansen	2016-08-11	2	-3/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Fix actionview test failure
\| * \| \|	Fix actionview test failure	Ryuta Kamizono	2016-08-11	2	-3/+3
\|/ / / \| \| \| \| \| \| \| \| \|	Caused by #26092.
* \| \|	Merge pull request #26110 from aditya-kapoor/minor-doc-fix	Guillermo Iguaran	2016-08-10	1	-2/+5
\|\ \ \ \| \| \| \| \| \| \| \|	Minor doc fix related to ActiveModel::SecurePassword [ci skip]
\| * \| \|	Minor doc fix related to ActiveModel::SecurePassword [ci skip]	Aditya Kapoor	2016-08-11	1	-2/+5
\| \| \| \|
* \| \| \|	prefer __dir__ over __FILE__ in File.expand_path	Xavier Noria	2016-08-11	6	-6/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Thinking .. relative to files is not natural, we are used to think "parent of a directory", and we have __dir__ nowadays.