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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Exclude template files for rdoc API [ci skip]	Francesco Rodriguez	2013-04-04	1	-1/+2
\|
*	Revert "Merge pull request #10034 from ↵	Rafael Mendonça França	2013-04-04	3	-33/+1
\| \| \| \| \| \| \| \| \|	benofsky/fix_skipping_object_callback_filters" This reverts commit c79c6980647eb76bfa52178711fb04ba7e9d403b, reversing changes made to ba4c27479add60b783a0e623c8a5d176c1dc9043. This broke all the tests. See https://travis-ci.org/rails/rails/builds/6061839
*	stop depending on callbacks	Aaron Patterson	2013-04-04	1	-6/+12
\|
*	Merge pull request #10034 from benofsky/fix_skipping_object_callback_filters	Rafael Mendonça França	2013-04-04	3	-1/+33
\|\ \| \| \| \|	Fixes skipping object callback filters
\| *	Fixes skipping object callback filters	Ben McRedmond	2013-04-04	3	-1/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows you to skip callbacks that are defined by objects, e.g. for `ActionController`: skip_after_filter MySpecialFilter Previously this didn't work due to a bug in how Rails compared callbacks in `Callback#matches?`. When a callback is compiled, if it's an object filter (i.e. not a method, proc, etc.), `Callback` now defines a method on `@klass` that is derived from the class name rather than `@callback_id`. So, when `skip_callback` tries to find the appropriate callback to remove, `Callback` can regenerate the method name for the filter object and return the correct value for `Callback#matches?`.
* \|	Merge pull request #10087 from neerajdotname/10016	Carlos Antonio da Silva	2013-04-04	7	-3/+26
\|\ \ \| \| \| \| \| \|	has_many through obeys order on through association
\| * \|	has_many through obeys order on through association	Neeraj Singh	2013-04-04	7	-3/+26
\| \| \| \| \| \| \| \| \| \| \| \|	fixes #10016
* \| \|	Merge pull request #10090 from vipulnsward/fix_private_warn	Steve Klabnik	2013-04-04	2	-3/+6
\|\ \ \ \| \| \| \| \| \| \| \|	fix private attribute warning
\| * \| \|	fix private attribute warning	Vipul A M	2013-04-04	2	-3/+6
\| \| \| \|
* \| \| \|	Further simplify enumerable group_by test	Carlos Antonio da Silva	2013-04-04	1	-3/+1
\| \| \| \|
* \| \| \|	Merge pull request #10076 from choudhuryanupam/master	Rafael Mendonça França	2013-04-04	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Removed unused comma after loop variable
\| * \| \| \|	Replaced inject with map	Anupam Choudhury	2013-04-04	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Removed unused comma after loop variable	Anupam Choudhury	2013-04-04	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #10088 from neerajdotname/fixes1	Rafael Mendonça França	2013-04-04	3	-5/+15
\|\ \ \ \ \| \|/ / / \|/\| \| \|	minor fixes including variable name change and expanded rdoc
\| * \| \|	expanded rdoc on source_reflection method	Neeraj Singh	2013-04-04	1	-0/+10
\| \| \| \|
\| * \| \|	show name of the klass that has missing association	Neeraj Singh	2013-04-02	1	-1/+1
\| \| \| \|
\| * \| \|	not a relation. it's an arel select manager	Neeraj Singh	2013-04-02	1	-4/+4
\| \| \| \|
* \| \| \|	Merge pull request #10082 from vipulnsward/fix_railties_test-v2	Steve Klabnik	2013-04-03	1	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	fix warnings in railties test
\| * \| \| \|	fix warnings in railties test	Vipul A M	2013-04-04	1	-3/+3
\|/ / / /
* \| \| \|	Fix typo in view name	Carlos Antonio da Silva	2013-04-03	2	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428
* \| \| \|	Merge pull request #10080 from vipulnsward/railties_warning_fix_v2	Steve Klabnik	2013-04-03	2	-1/+2
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	add require to suppress warning; remove variable
\| * \| \|	add require to suppress warning; remove variable	Vipul A M	2013-04-04	2	-1/+2
\| \| \| \|
* \| \| \|	Remove duplicated require from AR base test	Carlos Antonio da Silva	2013-04-03	1	-1/+0
\| \| \| \|
* \| \| \|	Merge pull request #10079 from prathamesh-sonpatki/typo	Carlos Antonio da Silva	2013-04-03	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fixed Typo
\| * \| \| \|	Fixed Typo	Prathamesh Sonpatki	2013-04-04	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #10078 from vipulnsward/railties_warning_fix_v1	Carlos Antonio da Silva	2013-04-03	2	-4/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix some railties test warnings
\| * \| \| \|	Fix some railties test warnings	Vipul A M	2013-04-03	2	-4/+3
\| \| \| \| \|
* \| \| \| \|	Add missing require to inheritance test	Carlos Antonio da Silva	2013-04-03	2	-3/+1
\| \|/ / / \|/\| \| \|
* \| \| \|	Move changelog entry to the top and fix conflict [ci skip]	Carlos Antonio da Silva	2013-04-03	1	-22/+20
\| \| \| \|
* \| \| \|	Merge pull request #9141 from adamgamble/issue-9091	David Heinemeier Hansson	2013-04-03	4	-0/+62
\|\ \ \ \ \| \|/ / / \|/\| \| \|	belongs_to :touch should touch old record when transitioning.
\| * \| \|	Modifies belong_to touch callback to touch old associations also #9091	Adam Gamble	2013-03-14	3	-10/+34
\| \| \| \|
\| * \| \|	+ Add test for auto timestamps update of both old & new parent records	PikachuEXE	2013-03-14	2	-0/+38
\| \| \| \|
* \| \| \|	Merge pull request #10049 from vipulnsward/optimize_around_merge_v1	Rafael Mendonça França	2013-04-03	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	optimize some code around merge
\| * \| \| \|	optimize some code around merge	Vipul A M	2013-04-03	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #10074 from ↵	Rafael Mendonça França	2013-04-03	6	-6/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	trevorturk/remove-fixme-comments-about-legacy-key-generator Remove comments about removing LegacyKeyGenerator in 4.1
\| * \| \| \| \|	Remove comments about removing LegacyKeyGenerator in 4.1	Trevor Turk	2013-04-03	6	-6/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #9932 from senny/9913_routing_problem	Andrew White	2013-04-03	2	-8/+41
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	routing bugfixes when matching multiple paths
\| * \| \| \| \| \|	routing shorthand syntax works with multiple paths	Yves Senn	2013-03-26	2	-5/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #9913. We need to expand the match shorthand syntax for every path.
\| * \| \| \| \| \|	bugfix, when matching multiple paths with `get`, `post`, ...	Yves Senn	2013-03-26	2	-3/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This problem was introduced with: https://github.com/rails/rails/commit/d03aa104e069be4e301efa8cefb90a2a785a7bff
* \| \| \| \| \| \|	Merge pull request #10070 from rubys/skip_bundle_in_railties_tests	Andrew White	2013-04-03	1	-1/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid running bundler on tests that don't need it
\| * \| \| \| \| \| \|	Avoid running bundler on tests that don't need it	Sam Ruby	2013-04-03	1	-1/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #10072 from senny/10071_format_on_scope_block_is_ignored	Andrew White	2013-04-03	2	-1/+23
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	fix regression in Mapper when `format:` was used in a `scope`.
\| * \| \| \| \| \| \|	fix regression in Mapper when `format:` was used in a `scope`.	Yves Senn	2013-04-03	2	-1/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #10071 `#normalize_path!` depends on the options so we need to call `#normalize_options!` first to make sure everything is set correctly.
* \| \| \| \| \| \| \|	Move alias method near to the aliased one in collection proxy	Carlos Antonio da Silva	2013-04-03	1	-2/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #10064 from thenickcox/fix_grammatical_error	Steve Klabnik	2013-04-02	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix grammatical error on JS helper warning message [ci skip]
\| * \| \| \| \| \| \|	Fix grammatical error on JS helper warning message	thenickcox	2013-04-02	1	-2/+2
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add changelog entry Delete changelog
* \| \| \| \| \| \|	Merge pull request #10063 from SamSaffron/master	Santiago Pastorino	2013-04-02	2	-15/+29
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Per #9999 revert blank? to empty?
\| * \| \| \| \| \| \|	Per #9999 revert the revert changing so columns are only tested for empty? ↵	Sam	2013-04-03	2	-15/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as opposed to blank? This is both faster and more correct, added tests to make sure this is not reverted again.
* \| \| \| \| \| \| \|	true/false => truthy falsy	Steve Klabnik	2013-04-02	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Getting rid of a few other vestiges of rails.png.	Steve Klabnik	2013-04-02	3	-1/+0
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We don't actually need a rails.png in the AP fixtures, the tests that use it don't actually try to load the file. We also don't need to get rid of it with the dummy reset either. Finally, it's not needed in the sample application that's included with the Rails Guides.