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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \| \|	Merge pull request #17179 from ↵	Zachary Scott	2014-10-04	1	-17/+14
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	eileencodes/clarify-delete-strategies-on-collection-proxy [ci skip] Clarify deletion strategies for collection proxies
\| * \| \| \| \| \| \| \| \| \|	[ci skip] Clarify deletion strategies for collection proxies	eileencodes	2014-10-04	1	-17/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For detailed testing of behavior see: https://gist.github.com/eileencodes/5b0a2fe011dcff6203fe This shows destroy_all always destroys records and fires callbacks. It will never use nullify or delete_all delete_all's behavior varies greatly based on `hm` vs `hm:t` and deletion strategy.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #17176 from kuldeepaggarwal/doc-alias_method_chain	Zachary Scott	2014-10-04	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	doc added for `writer` method in `alias_method_chain` [ci skip]
\| * \| \| \| \| \| \| \| \| \|	doc added for `writer` method in `alias_method_chain`[ci skip]	Kuldeep Aggarwal	2014-10-04	1	-2/+2
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Clarify possible validations you can use to avoid a NULL boolean value	Zachary Scott	2014-10-03	1	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in the database. Closes #16304 [ci skip]
* \| \| \| \| \| \| \| \| \|	Merge pull request #16409 from ↵	Zachary Scott	2014-10-03	5	-15/+26
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	justinweiss/update_validation_context_documentation Docs: Add a note on custom validation contexts. [ci skip]
\| * \| \| \| \| \| \| \| \| \|	Add a note on custom validation contexts.	Justin Weiss	2014-08-05	5	-15/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The documentation on `:on` for validations was inconsistent, and most only referenced the `:create` and `:update` contexts. I fixed those to be consistent with the documentation on `AM::Validations.validates`, which seemed to have the best docs. [ci skip]
* \| \| \| \| \| \| \| \| \| \|	:heart: 1.9	Matthew Draper	2014-10-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #14146 from chewi/fix-underscore-acronyms-regex	Matthew Draper	2014-10-04	3	-1/+8
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix underscore inflector handling of namespaced and adjacent acronyms
\| * \| \| \| \| \| \| \| \| \| \|	Fix underscore inflector handling of adjacent acronyms	James Le Cuirot	2014-10-03	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I suspect that positive lookbehind would have been used in the original implementation had it been available in supported Ruby versions at the time. Now that Rails requires Ruby 1.9.2 or above, this is no longer an issue. This fixes #14146 for acronyms such as APIRESTful. This technique also addresses namespaced acronyms that are not entirely uppercased. This was broken when the commit was originally written but has since been fixed in ccbb481. The latter does not deal with adjacent acronyms so this commit wins.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17150 from effektz/tr-instead-of-gsub	Jeremy Kemper	2014-10-03	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use #tr instead of #gsub where possible
\| * \| \| \| \| \| \| \| \| \| \| \|	Use #tr instead of #gsub where possible	Alex Weidmann	2014-10-02	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17172 from rselk/typo	Abdelkader Boudih	2014-10-03	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	fix typo in in define_model_callbacks comment [ci skip]
\| * \| \| \| \| \| \| \| \| \| \| \|	fix typo in in define_model_callbacks comment [ci skip]	Ryan Selk	2014-10-03	2	-2/+2
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17168 from jwworth/task/fix_typo	Xavier Noria	2014-10-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo [ci skip]
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix typo	Jake Worth	2014-10-03	1	-1/+1
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17167 from kuldeepaggarwal/doc-define_model_callbacks	Rafael Mendonça França	2014-10-03	2	-0/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add notes for `define_model_callbacks`
\| * \| \| \| \| \| \| \| \| \| \| \|	add notes for `define_model_callbacks` [ci skip]	Kuldeep Aggarwal	2014-10-03	2	-0/+6
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17160 from lsylvester/duration-hash	Aaron Patterson	2014-10-03	2	-0/+8
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	define hash on duration
\| * \| \| \| \| \| \| \| \| \| \| \|	define hash on duration	lsylvester	2014-10-03	2	-0/+8
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	minor fixes in the configuring guide [ci skip]	Xavier Noria	2014-10-03	1	-15/+15
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Revert "Fix style for rescue responses doc [ci skip]"	Xavier Noria	2014-10-03	1	-16/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reason: There is a wrong newline, a typo, and the change to singular is not good. This reverts commit d76380cf1ccec7ffeff19827ae9b6d9b71327418.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17153 from yuki24/fix-doc-format-for-rescue-responses	Abdelkader Boudih	2014-10-03	1	-15/+16
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Railsguides] Fix style for rescue responses doc [ci skip]
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix style for rescue responses doc [ci skip]	Yuki Nishijima	2014-10-02	1	-15/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Change 'Any *s that are...' to 'Any * that is...' * Fix style for default rescue_responses setting This is a follow-up commit to: * https://github.com/rails/rails/pull/17076 * https://github.com/yuki24/rails/commit/89b8836f2470c689f6b7d52cab3a418bb63aef26
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17151 from y-yagi/patch-1	Abdelkader Boudih	2014-10-03	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] add `test:jobs` task to testing guide
\| * \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] add `test:jobs` task to testing guide	yuuji.yaginuma	2014-10-03	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17148 from mgenereu/patch-1	Xavier Noria	2014-10-02	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Disallow appended newlines when parsing as integer
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Disallow appended newlines when parsing as integer	Michael Genereux	2014-10-02	1	-1/+1
\|/ / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	\Z allows appended newlines where \z does not.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17068 from mokhan/update-active-job-documentation	Abdelkader Boudih	2014-10-02	6	-5/+64
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	[ci-skip] Update Active Job API documentation
\| * \| \| \| \| \| \| \| \| \| \| \|	Add documentation on Active Job.	mo khan	2014-10-02	6	-5/+64
\|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds documentation for the Active Job API. It includes documentation on how to configure the queue_adapter, and how to create new jobs. It adds links to the various other sections of the Active Job documentation.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17088 from robin850/jruby-dev	Rafael Mendonça França	2014-10-01	9	-2/+12
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow up to #16613
\| * \| \| \| \| \| \| \| \| \| \| \|	Follow up to #16613	Robin Dupret	2014-09-28	9	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we want this flag to be enabled anytime we are running the tests under JRuby, let's enable this at the Rakefile level so people get the performance boost on their local checkout. Moreover, we avoid having to update this particular line anytime the option changes on the JRuby side. The only drawback is that we have to define it in every Rakefile but there's no big deal, this is already the case for other options.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17125 from acrogenesis/master	Xavier Noria	2014-10-01	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use tr instead of gsub when possible
\| * \| \| \| \| \| \| \| \| \| \| \| \|	use tr instead of gsub when possible	Adrian Rangel	2014-10-01	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17124 from yuktikhurana/fix_render_file_guide	Abdelkader Boudih	2014-10-01	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	In render file, by default the current layout is rendered always [ci skip]
\| * \| \| \| \| \| \| \| \| \| \| \| \|	In render file, by default the current layout is rendered always	yuktikhurana	2014-10-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17113 from igor04/helpers-highlight	Rafael Mendonça França	2014-09-30	2	-1/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added processing of `nil` to `highlight` helper method
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Added processing of `nil` to `highlight` helper method	igor04	2014-09-30	2	-1/+5
\| \|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17114 from pabloh/replace_use_of_eval_with_lambda	Rafael Mendonça França	2014-09-30	2	-3/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor callback setup to use lambda instead of eval
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor callback setup in to use lambda instead of eval	Pablo Herrero	2014-09-30	2	-3/+5
\| \|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Generate the application pointing to rails-dom-testing master	Rafael Mendonça França	2014-09-30	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It is temporary until we do the final release
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17118 from zhangsu/patch-1	Abdelkader Boudih	2014-09-30	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Update single table inheritance link anchor
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Update single table inheritance link anchor	Su Zhang (張甦)	2014-09-30	1	-1/+1
\|/ / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The current one is old-of-date and doesn't make the browser navigation to the correct heading.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17110 from claudiob/remove-running-tests	Yves Senn	2014-09-30	1	-17/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove RUNNING UNIT TESTS from ActionPack
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Remove RUNNING UNIT TESTS from ActionPack	claudiob	2014-09-30	1	-17/+0
\|/ / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Following discussion with @senny https://github.com/rails/rails/pull/17100#issuecomment-57285273 it only makes sense to keep this file form projects that require extra instructions.
* \| \| / / / / / / / / / /	Responder was removed at ee77770d57de9da87b05a2fe84b9d46ec6852c62	Akira Matsuda	2014-09-30	1	-1/+0
\| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	fixes typo in AS CHANGELOG [ci skip]	Xavier Noria	2014-09-29	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	References f92ac24.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17107 from kaspth/parse-html-as-fragments	Rafael Mendonça França	2014-09-29	6	-7/+9
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Parse HTML as document fragment.
\| * \| \| \| \| \| \| \| \| \| \| \|	Parse HTML as document fragment.	Kasper Timm Hansen	2014-09-29	6	-7/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is to match the changes in Rails Dom Testing rails/rails-dom-testing#20.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17093 from ↵	Aaron Patterson	2014-09-29	8	-22/+31
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	phiggins/remove-dynamic-send-on-built-in-callbacks Reduce allocations when running AR callbacks.