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

	Commit message (Expand)	Author	Age	Files	Lines
*	"Or" was not meaningful anymore, per dad7fdc5734a3813246f238ac5760b2076932216	Philip Arndt	2012-02-15	1	-1/+1
*	Merge pull request #3544 from amatsuda/_field_changed	Aaron Patterson	2012-02-14	3	-4/+18
\|\
\| *	A test case for GH #3544 to ensure that a field named field works fine	Akira Matsuda	2012-02-14	1	-0/+14
\| *	Rename field_changed? to _field_changed? so that users can create a field nam...	Akira Matsuda	2012-02-14	2	-4/+4
* \|	Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redo	José Valim	2012-02-14	1	-1/+4
\|\ \
\| * \|	Always reenable _dump task in AR databases rake. Closes #5030	Carlos Antonio da Silva	2012-02-14	1	-1/+4
* \| \|	Merge pull request #5039 from funny-falcon/fix_callback	José Valim	2012-02-14	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	sync __run_callbacks with ruby-trunk	Sokolov Yura	2012-02-14	1	-1/+1
\|/ /
* \|	Merge pull request #5036 from carlosantoniodasilva/form-button	José Valim	2012-02-14	1	-8/+1
\|\ \
\| * \|	Remove not used button translation from av locale	Carlos Antonio da Silva	2012-02-14	1	-8/+1
\|/ /
* \|	Merge pull request #5032 from carlosantoniodasilva/collection-helpers-object	José Valim	2012-02-14	4	-9/+36
\|\ \
\| * \|	Allow collection helpers with block to access current object in the collection	Carlos Antonio da Silva	2012-02-13	4	-9/+36
* \| \|	Merge pull request #5035 from lest/patch-1	José Valim	2012-02-13	8	-9/+0
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	remove unnecessary require core_ext/string/encoding	Sergey Nartimov	2012-02-14	8	-9/+0
\|/ /
* \|	Merge pull request #3305 from cjolly/request_filtered_env	Jeremy Kemper	2012-02-13	2	-1/+34
\|\ \ \| \|/ \|/\|
\| *	Exclude rack.request.form_vars from request.filtered_env	Chad Jolly	2012-01-18	2	-1/+34
* \|	Merge pull request #5031 from carlosantoniodasilva/sprockets-compressors-refa...	Jeremy Kemper	2012-02-13	3	-23/+25
\|\ \
\| * \|	Use Hash#fetch instead of testing for #key?	Carlos Antonio da Silva	2012-02-13	2	-3/+3
\| * \|	Refactor sprockets compressors module	Carlos Antonio da Silva	2012-02-13	1	-20/+22
\|/ /
* \|	Merge pull request #5026 from castlerock/remove_require_for_string_encoding	Santiago Pastorino	2012-02-13	2	-2/+0
\|\ \
\| * \|	remove unwanted require for string encoding	Vishnu Atrai	2012-02-13	2	-2/+0
* \| \|	Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare	Aaron Patterson	2012-02-13	1	-1/+1
\|\ \ \
\| * \| \|	fixes rake db:test:prepare when using postgresql with sql db structure file a...	Sean Kirby	2012-02-01	1	-1/+1
* \| \| \|	Merge pull request #5000 from flavorpill/master-with-multidb-association-fix	Aaron Patterson	2012-02-13	11	-10/+40
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	fix associations when using per class databases	Lars Kanis	2012-02-10	3	-8/+5
\| * \| \|	added test for #3732	Rick Martinez	2012-02-10	8	-2/+35
* \| \| \|	Merge pull request #5012 from waseem/alias-reconnect-mysql2	Aaron Patterson	2012-02-13	1	-5/+1
\|\ \ \ \
\| * \| \| \|	Alias reconnect! to reset! for Mysql2 adapter since they have same	Waseem Ahmad	2012-02-12	1	-5/+1
* \| \| \| \|	Merge pull request #5018 from hammerdr/issue-4659-docs	Aaron Patterson	2012-02-13	1	-4/+7
\|\ \ \ \ \
\| * \| \| \| \|	Missed a code example. Fixing the docs to be consistant.	Derek Hammer	2012-02-12	1	-1/+1
\| * \| \| \| \|	Adding documentation to clarify usage of attributes hash.	Derek Hammer	2012-02-12	1	-3/+6
* \| \| \| \| \|	Merge pull request #5024 from carlosantoniodasilva/amo-serializable-hash-stri...	José Valim	2012-02-13	2	-46/+45
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Make sure serializable hash with :methods option returns always string keys	Carlos Antonio da Silva	2012-02-13	2	-4/+4
\| * \| \| \| \| \|	Cleanup extra spaces	Carlos Antonio da Silva	2012-02-13	1	-45/+44
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #5016 from exviva/form_helper_date_fields	José Valim	2012-02-12	9	-5/+82
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add HTML5 input[type="date"] helper	Olek Janiszewski	2012-02-12	9	-5/+82
* \| \| \| \| \| \|	Merge pull request #5021 from tchandy/clean_controller_tests	José Valim	2012-02-12	3	-39/+0
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Removing old Controller test	Thiago Pradi	2012-02-12	3	-39/+0
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	prefer tr to gsub for replacing characters	Xavier Noria	2012-02-12	1	-2/+2
* \| \| \| \| \| \|	inflection regexp are meant to be applied once	Xavier Noria	2012-02-12	1	-2/+2
* \| \| \| \| \| \|	removes redundant argument	Xavier Noria	2012-02-12	1	-1/+1
* \| \| \| \| \| \|	boosts inflections	Xavier Noria	2012-02-12	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #5015 from castlerock/revert_PR_5001_fix_isolated_test_run	José Valim	2012-02-12	4	-0/+5
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Revert PR#5001 "removed unuseful require for reply as we are not using requir...	Vishnu Atrai	2012-02-12	4	-0/+5
\|/ / / / /
* \| \| \| \|	Merge pull request #5014 from castlerock/fix_build_PR_5001	Xavier Noria	2012-02-12	1	-0/+1
\|\ \ \ \ \
\| * \| \| \| \|	fix build 5001, model reply is required in cases/primary_keys_test too!	Vishnu Atrai	2012-02-12	1	-0/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #5013 from castlerock/fix_build_pull_5001	José Valim	2012-02-12	1	-0/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	fix build #5001 reply model required in relations_test	Vishnu Atrai	2012-02-12	1	-0/+1
\|/ / / /
* \| \| \|	Merge pull request #5010 from tchandy/clean_routing_tests	José Valim	2012-02-11	2	-58/+2
\|\ \ \ \
\| * \| \| \|	Cleaning Route generation tests	Thiago Pradi	2012-02-12	2	-58/+2
\|/ / / /