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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| * \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Oscar Del Ben	2012-04-28	124	-2556/+2044
\| \| \|\ \ \ \
\| \| \| * \| \| \|	Correct small consistency issue in AR querying guide	Matthias Schmidt	2012-04-28	1	-1/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Code-format references to config settings	Mark Rushakoff	2012-04-27	7	-7/+7
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Update guides - run single test for AR testing	Alexey Vakhov	2012-04-28	1	-0/+6
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Update contributing guide - run single test	Alexey Vakhov	2012-04-28	1	-0/+7
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Update AM example	Alexey Vakhov	2012-04-28	1	-3/+3
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	More using <tt>x</tt> instead of +x+ when the latter renders improperly.	Mark Rushakoff	2012-04-27	3	-4/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add REST section to getting started guide	Oscar Del Ben	2012-04-28	2	-10/+50
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Document exception handling inside resce_from handlers	twinturbo	2012-04-28	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2532 from ↵	Piotr Sarnacki	2012-04-30	2	-0/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	hasclass/as_json__encode_infinite_and_nan_floats_as_null JSON: Encode infinite or NaN floats as `null` to generate valid JSON.
\| * \| \| \| \| \| \|	JSON: Encode infinite or NaN floats as null to generate valid JSON.	Sebi Burkhard	2011-08-15	2	-0/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #6093 from marcandre/observer_public	Jeremy Kemper	2012-04-30	2	-21/+27
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	notify_observers should be public
\| * \| \| \| \| \| \| \|	notify_observers should be public	Marc-Andre Lafortune	2012-04-30	2	-21/+27
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #6063 from marcandre/observer_extra_args	Aaron Patterson	2012-04-30	2	-11/+26
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow extra arguments for Observers
\| * \| \| \| \| \| \| \|	Allow extra arguments for Observers	Marc-Andre Lafortune	2012-04-30	2	-11/+26
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	remove useless assertions	Aaron Patterson	2012-04-30	1	-10/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	return value of block is returned	Aaron Patterson	2012-04-30	2	-3/+14
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	only yield to finder block if something is found	Aaron Patterson	2012-04-30	2	-1/+11
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fix PR #6091	Andrew White	2012-04-30	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. ActiveRecord::Base is not ActiveRecord::Relation 2. The order of records from an SQL query is uncertain without an ORDER clause 3. Run your own tests when submitting a pull request
* \| \| \| \| \| \| \| \|	Merge pull request #5181 from mcmire/issue_3560	Jeremy Kemper	2012-04-30	2	-20/+37
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle distance_of_time_in_words boundary conditions. Fixes #3560.
\| * \| \| \| \| \| \| \| \|	distance_of_time_in_words: Add/tweak comments to understand time intervals ↵	Elliot Winkler	2012-04-30	2	-18/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	better
\| * \| \| \| \| \| \| \| \|	distance_of_time_in_words: 45-60 days is about 2 months, not about 1 month	Elliot Winkler	2012-04-30	2	-3/+6
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #6091 from twinturbo/add-ids	Yehuda Katz	2012-04-30	2	-0/+14
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Add ActiveRecord::Base#ids - Close #5812
\| * \| \| \| \| \| \| \|	Add ActiveRecord::Base#ids	twinturbo	2012-04-30	2	-0/+14
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #5175 from jasonnoble/rake_notes_directories	Jeremy Kemper	2012-04-30	3	-2/+90
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Custom directories for rake notes
\| * \| \| \| \| \| \|	Remove empty lines.	Jason Noble	2012-04-30	1	-4/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fixed styling issues brought up by @jeremy	Jason Noble	2012-04-30	2	-3/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add documentation to command_line.textile explaining how to use additional ↵	Jason Noble	2012-04-30	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	notes directories
\| * \| \| \| \| \| \|	Add ability to specify custom annotation directories	Jason Noble & Ralph Shnelvar	2012-04-30	2	-1/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SOURCE_ANNOTATION_DIRECTORIES='dir1,dir2' bundle exec rake notes Searches app, config, lib, script, test (default) Also searches dir1, dir2 References: #4536, #4540
\| * \| \| \| \| \| \|	Add test coverage for rake notes	Jason Noble & Ralph Shnelvar	2012-04-30	1	-1/+36
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add separate tests to verify directories covered Add tests to verify file_types
* \| \| \| \| \| \|	Merge pull request #5705 from lest/patch-3	Jeremy Kemper	2012-04-30	2	-1/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	split CDATA end token in cdata_section helper
\| * \| \| \| \| \| \|	split CDATA end token in cdata_section helper	Sergey Nartimov	2012-04-30	2	-1/+10
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_stores	José Valim	2012-04-30	2	-0/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support cookie jar options for all cookie stores
\| * \| \| \| \| \| \| \|	Support cookie jar options for all cookie stores	brainopia	2012-04-30	2	-0/+14
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #6082 from brainopia/smarter_cookie_jar	José Valim	2012-04-30	2	-15/+46
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stream cookies only if needed
\| * \| \| \| \| \| \| \| \|	Dont stream back cookie value if it was set to the same value	brainopia	2012-04-30	2	-4/+18
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Dont set cookie header for deletion of unexisting data	brainopia	2012-04-30	2	-9/+26
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Simplify matching with array of possible domains	brainopia	2012-04-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Use more appropriate one-liner for class declaration	brainopia	2012-04-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #6083 from brainopia/remove_unused_closed_ivars	José Valim	2012-04-30	2	-2/+0
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|	Remove a couple of unused ivars left from previous refactoring
\| * \| \| \| \| \| \| \| \|	Remove unused ivars left from close checks	brainopia	2012-04-30	2	-2/+0
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These ivars were missed in d142572567 when close checks were removed
* \| \| \| \| \| \| \| \|	Merge pull request #3726 from JanDupal/fix-date-helper-hidden	José Valim	2012-04-30	2	-0/+34
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	fix Helpers::DateHelper with :use_hidden - hide separators
\| * \| \| \| \| \| \| \|	fix Helpers::DateHelper with :use_hidden - hide separators	Jan Dupal	2011-11-22	2	-0/+34
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #5838 from IamNaN/patch-1	Andrew White	2012-04-30	1	-2/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Incorporating Pacific Island zone changes circa Dec 31 2011
\| * \| \| \| \| \| \| \| \|	Correcting some confusion. Pago Pago is part of American Samoa, not Samoa. ↵	Dave Gerton	2012-04-13	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Further, Samoa and Tokelau jumped across the IDL from Dec 29 to Dec 31, 2011 switching from UTC-11 to UTC+13. American Samoa did not make the change and remains at UTC-11. Pacific/Fakaofo and Pacific/Apia are in TZInfo and documentation about the dateline change is in austalasia at IANA.
* \| \| \| \| \| \| \| \| \|	Merge pull request #6080 from carlosantoniodasilva/as-changelog-update	Xavier Noria	2012-04-30	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve changelog of new :silence deprecation behavior
\| * \| \| \| \| \| \| \| \| \|	Improve changelog of new :silence deprecation behavior	Carlos Antonio da Silva	2012-04-30	1	-1/+1
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #6079 from arunagw/build_fix_master_observing_test	José Valim	2012-04-30	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	build fix for observing_test.rb
\| * \| \| \| \| \| \| \| \| \|	build fix for observing_test.rb	Arun Agrawal	2012-04-30	1	-1/+1
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	introduced here 17c990b153f8635874c006a7460ee95817543fc1
* \| \| \| \| \| \| \| \| \|	Merge pull request #6077 from ↵	José Valim	2012-04-30	5	-65/+98
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dmitriy-kiriyenko/improve_signature_of_time_in_words_helper Replace boolean argument with an options hash.