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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Put spaces between the words at deprecation warning	Rafael Mendonça França	2012-01-31	1	-3/+3
\|
*	Merge pull request #4792 from rafaelfranca/build-fix	José Valim	2012-01-31	2	-1/+2
\|\ \| \| \| \|	Only add ActiveRecord configuration if it is present
\| *	Only add ActiveRecord configuration if it is present	Rafael Mendonça França	2012-01-31	2	-1/+2
\| \|
* \|	to_proper_path -> to_partial_path	José Valim	2012-01-31	1	-1/+1
\| \|
* \|	Update actionpack/lib/action_view/renderer/partial_renderer.rb	José Valim	2012-01-31	1	-2/+1
\|/
*	Merge pull request #4783 from gregolsen/ids_reader_fix	Jon Leighton	2012-01-31	3	-1/+6
\|\ \| \| \| \|	ids_reader method fixed, test added to has_many association (for PostgreSQL)
\| *	ids_reader method fixed, test added to has_many association	gregolsen	2012-01-31	3	-1/+6
\| \|
* \|	Merge pull request #4727 from railsaholic/dependent_restrict_should_add_error	Jon Leighton	2012-01-31	11	-35/+157
\|\ \ \| \| \| \| \| \|	has_many/has_one, :dependent => :restrict, deprecation added
\| * \|	suggested fixes for :dependent => :restrict deprecation.	Manoj	2012-01-31	5	-36/+16
\| \| \|
\| * \|	Same method for has_many and has_one associations	Paco Guzman	2012-01-31	3	-30/+17
\| \| \|
\| * \|	Easy dependent_restrict error message	Paco Guzman	2012-01-31	2	-4/+2
\| \| \|
\| * \|	has_many/has_one, :dependent => :restrict, deprecation added.	Manoj	2012-01-29	11	-21/+178
\| \| \|
* \| \|	Merge pull request #4788 from arunagw/warning_remove_shadowing_var	Santiago Pastorino	2012-01-31	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \|	warning removed: shadowing outer local variable - klass
\| * \| \|	warning removed: shadowing outer local variable - klass	Arun Agrawal	2012-01-31	1	-2/+2
\|/ / /
* \| \|	Merge pull request #4782 from lest/patch-1	José Valim	2012-01-31	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \|	fix assets test
\| * \|	fix assets test	Sergey Nartimov	2012-01-31	1	-1/+1
\|/ /
* \|	Merge pull request #4763 from kennyj/fix_4754	Jon Leighton	2012-01-31	2	-1/+17
\|\ \ \| \| \| \| \| \|	[MySQL] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES
\| * \|	Fix GH #4754. Remove double-quote when using ANSI_QUOTES	kennyj	2012-01-31	2	-1/+17
\| \| \|
* \| \|	Merge pull request #4732 from pwim/refactor-dynamic-match	Jon Leighton	2012-01-30	3	-28/+60
\|\ \ \ \| \| \| \| \| \| \| \|	Refactor dynamic match
\| * \| \|	Use conditional instead of try	Paul McMahon	2012-01-31	1	-1/+1
\| \| \| \|
\| * \| \|	Decouple finding matching class from instantiation	Paul McMahon	2012-01-29	1	-22/+29
\| \| \| \|
\| * \| \|	Move argument validation into match	Paul McMahon	2012-01-28	3	-1/+13
\| \| \| \|
\| * \| \|	Extract different DynamicFinderMatch subclasses	Paul McMahon	2012-01-28	1	-26/+39
\| \| \| \|
* \| \| \|	Merge pull request #4769 from sikachu/failing-test	Xavier Noria	2012-01-30	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix failing test from [7619bcf2]
\| * \| \| \|	Fix failing test from [7619bcf2]	Prem Sichanugrist	2012-01-30	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	query cache instrumentation should included the bindings in the payload ↵	Xavier Noria	2012-01-30	1	-1/+1
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	[closes #4750]
* \| \| \|	rewrites a couple of alternations in regexps as character classes	Xavier Noria	2012-01-30	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Character classes are the specific regexp construct to express alternation of individual characters.
* \| \| \|	Merge pull request #4767 from lest/patch-2	José Valim	2012-01-30	2	-56/+26
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	merge MRI performance methods into one file
\| * \| \| \|	merge MRI performance methods into one file	Sergey Nartimov	2012-01-30	2	-56/+26
\|/ / / /
* \| \| \|	Merge pull request #4765 from vijaydev/fix_4764	Santiago Pastorino	2012-01-30	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fixes #4764 - remove generated new line in routes.rb on scaffold generation
\| * \| \| \|	Fixes #4764 - remove generated new line in routes.rb on scaffold generation	Vijay Dev	2012-01-31	1	-1/+1
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As explained in #4764, when destroying a scaffold, routes.rb loses a new line. This seems to happen because a new line is added while generating the route and the destroy generator removes it. However, this causes a problem if the routes file is manually edited to remove such new lines. This commit just removes that extra new line from added in the first place.
* \| \| \|	Merge pull request #4753 from rahul100885/rahul100885_work	Santiago Pastorino	2012-01-30	1	-14/+16
\|\ \ \ \ \| \| \|/ / \| \|/\| \|	Used block to make sure file get auto closed after use
\| * \| \|	Used block to make sure file get auto closed after use	Rahul P. Chaudhari	2012-01-30	1	-14/+16
\|/ / /
* \| \|	Merge pull request #4745 from lest/patch-1	José Valim	2012-01-29	1	-6/+2
\|\ \ \ \| \| \| \| \| \| \| \|	remove ruby 1.8 support code
\| * \| \|	remove ruby 1.8 support code	Sergey Nartimov	2012-01-29	1	-6/+2
\|/ / /
* \| \|	Merge pull request #4744 from ndbroadbent/replace_for_loops_with_enumerables	Santiago Pastorino	2012-01-29	11	-33/+33
\|\ \ \ \| \| \| \| \| \| \| \|	Replaced all 'for' loops with Enumerable#each
\| * \| \|	Use block form of 'File.open' so that File object is auto closed at end	Nathan Broadbent	2012-01-30	2	-14/+14
\| \| \| \|
\| * \| \|	Replaced all 'for' loops with Enumerable#each	Nathan Broadbent	2012-01-30	11	-19/+19
\| \| \| \|
* \| \| \|	Merge pull request #4743 from atd/patch-1	José Valim	2012-01-29	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Add 'image/pjpeg' format used by IE
\| * \| \|	Add 'image/pjpeg' format used by IE	Antonio Tapiador	2012-01-29	1	-1/+1
\|/ / / \| \| \| \| \| \|	http://msdn.microsoft.com/en-us/library/ms775147%28v=vs.85%29.aspx#_replace
* \| \|	Merge pull request #4739 from nashby/refactor-date-helper	Santiago Pastorino	2012-01-29	2	-15/+9
\|\ \ \ \| \| \| \| \| \| \| \|	tiny refactoring of date_helper
\| * \| \|	tiny refactoring	Vasiliy Ermolovich	2012-01-29	2	-15/+9
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \|	use :default option with translate method instead of condition simplify separator method
* \| \|	Merge pull request #4741 from pacoguzman/initialize_variable_not_needed	Santiago Pastorino	2012-01-29	1	-2/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Remove initialize variable columnn, not needed
\| * \| \|	Remove initialize variable columnn, not needed	Paco Guzman	2012-01-29	1	-2/+1
\|/ / /
* \| \|	Merge pull request #4740 from castlerock/remove_autoload_UrlWriter	José Valim	2012-01-29	1	-1/+0
\|\ \ \ \| \|/ / \|/\| \|	remove autoload UrlWriter, no longer exists
\| * \|	remove autoload UrlWriter, no longer exists	Vishnu Atrai	2012-01-29	1	-1/+0
\|/ /
* \|	Merge pull request #4731 from ndbroadbent/revert_build_original_fullpath	Santiago Pastorino	2012-01-27	1	-1/+9
\|\ \ \| \| \| \| \| \|	Reverted build_original_fullpath method refactor
\| * \|	Reverted build_original_fullpath method, as per discussion at ↵	Nathan Broadbent	2012-01-28	1	-1/+9
\|/ / \| \| \| \| \| \|	https://github.com/rails/rails/pull/4470/files#r393461
* \|	Merge pull request #4730 from carlosantoniodasilva/patch-1	Santiago Pastorino	2012-01-27	1	-1/+0
\|\ \ \| \|/ \|/\|	Remove not used env[] call in routing_test.
\| *	Remove not used env[] call in routing_test.	Carlos Antonio da Silva	2012-01-27	1	-1/+0
\|/ \| \|	The commit 4c321c6d42b6e35f9ead12eb1dccdead03c5abf4 removes the path_params variable assignment, actually the entire line is not used at all.