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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \|	CSS fix for guides. Closing #5028 [ci skip]	Vijay Dev	2012-02-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In Ubuntu Chrome, in the last lines of code blocks, the underscore isn't visible. Increasing the line height slightly seems to fix this. This problem doesn't exist in Firefox even on Ubuntu. Too lazy to test in any other OS-browser combo :)
* \| \| \| \|	Merge pull request #5042 from parndt/patch-2	Vijay Dev	2012-02-14	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	"Or" was not meaningful anymore, per dad7fdc5734a3813246f238ac5760b2076932216
\| * \| \| \| \|	"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
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Rename field_changed? to _field_changed? so that users can create a field named field
\| * \| \| \| \|	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 ↵	Akira Matsuda	2012-02-14	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	named field
* \| \| \| \| \|	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
\| * \| \| \| \| \|	Always reenable _dump task in AR databases rake. Closes #5030	Carlos Antonio da Silva	2012-02-14	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows the internal :_dump task to be called as many times as required. For instance, `rake db:migrate:redo` calls two tasks that internally call :_dump, and without reenabling it to be reinvoked, the database was left in incorrect state.
* \| \| \| \| \| \|	Merge pull request #5039 from funny-falcon/fix_callback	José Valim	2012-02-14	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	sync __run_callbacks with ruby-trunk
\| * \| \| \| \| \|	sync __run_callbacks with ruby-trunk	Sokolov Yura	2012-02-14	1	-1/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/34580 In this revision behavior of respond_to? had changed: now to ask about protected method one should pass second argument `true`
* \| \| \| \| \|	Merge pull request #5036 from carlosantoniodasilva/form-button	José Valim	2012-02-14	1	-8/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove not used button translation from av locale
\| * \| \| \| \| \|	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
\| * \| \| \| \| \|	Allow collection helpers with block to access current object in the collection	Carlos Antonio da Silva	2012-02-13	4	-9/+36
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This gives a lot more flexibility to the user, for instance to generate a collection of check boxes and labels, allowing to add custom classes or data-* attributes to the label/check_box using another object attribute. This basically mimics options_for_select functionality that accepts a third option for each item to generate html attributes for each option.
* \| \| \| \| \|	Merge pull request #5035 from lest/patch-1	José Valim	2012-02-13	8	-9/+0
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	remove unnecessary require core_ext/string/encoding
\| * \| \| \| \|	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
\| * \| \| \|	Exclude rack.request.form_vars from request.filtered_env	Chad Jolly	2012-01-18	2	-1/+34
\| \| \| \| \|
* \| \| \| \|	Merge pull request #5031 from ↵	Jeremy Kemper	2012-02-13	3	-23/+25
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	carlosantoniodasilva/sprockets-compressors-refactor Sprockets compressors refactor
\| * \| \| \| \|	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 unused require for string encoding
\| * \| \| \| \|	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
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix usage of psql in db:test:prepare
\| * \| \| \| \| \|	fixes rake db:test:prepare when using postgresql with sql db structure file ↵	Sean Kirby	2012-02-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and specifying a template in database.yml
* \| \| \| \| \| \|	Merge pull request #5000 from flavorpill/master-with-multidb-association-fix	Aaron Patterson	2012-02-13	11	-10/+40
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|	Fix associations with per-class/multiple database connections
\| * \| \| \| \| \|	fix associations when using per class databases	Lars Kanis	2012-02-10	3	-8/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	would get ConnectionNotEstablished error because it always tried to use ActiveRecord::Base's connection, even though it should be using the connection of the model whose context we're operating in
\| * \| \| \| \| \|	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 behavior.
\| * \| \| \| \| \| \|	Alias reconnect! to reset! for Mysql2 adapter since they have same	Waseem Ahmad	2012-02-12	1	-5/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	behavior.
* \| \| \| \| \| \| \|	Merge pull request #5018 from hammerdr/issue-4659-docs	Aaron Patterson	2012-02-13	1	-4/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding documentation to clarify usage of attributes hash.
\| * \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Serialization uses only the attributes hash's keys and calls methods that are of the same name as the keys on the serialized object.
* \| \| \| \| \| \| \| \|	Merge pull request #5024 from ↵	José Valim	2012-02-13	2	-46/+45
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	carlosantoniodasilva/amo-serializable-hash-string-keys Fix ActiveModel serializable hash to return string keys with :methods
\| * \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \| \|	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
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The impact of this change has been measured pluralizing the entire /usr/share/dict/words, showing a 6x speedup
* \| \| \| \| \| \| \| \|	Merge pull request #5015 from castlerock/revert_PR_5001_fix_isolated_test_run	José Valim	2012-02-12	4	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	TO make build green Revert PR#5001 "removed unuseful require for reply as we are not using require model"
\| * \| \| \| \| \| \| \|	Revert PR#5001 "removed unuseful require for reply as we are not using ↵	Vishnu Atrai	2012-02-12	4	-0/+5
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	require model" This reverts commit 7381596ea32aff47222af89e4bc66000f4597acb.
* \| \| \| \| \| \| \|	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! for isolated test
\| * \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \|	fix build #5001 reply model required in relations_test	Vishnu Atrai	2012-02-12	1	-0/+1
\|/ / / / / / /