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	Vijay Dev	2012-05-08	2	-24/+114
\|\
\| *	cut some duplication and minor edits [ci skip]	Vijay Dev	2012-05-08	1	-37/+4
\| \|
\| *	added docs to cattr_reader	Francesco Rodriguez	2012-05-07	1	-0/+27
\| \|
\| *	better docs for cattr_accessor and cattr_writer	Francesco Rodriguez	2012-05-07	1	-2/+14
\| \|
\| *	added docs and examples to cattr_writer method	Francesco Rodriguez	2012-05-07	1	-5/+41
\| \|
\| *	added docs to cattr_accessor method	Francesco Rodriguez	2012-05-07	1	-12/+50
\| \|
\| *	adding example about using cattr_accessor with subclasses	Francesco Rodriguez	2012-05-07	1	-0/+8
\| \|
\| *	Add missing public method doc to TimeWithZone.name	Rob Zolkos	2012-05-06	1	-1/+3
\| \|
* \|	Merge pull request #5500 from panthomakos/load-all	Michael Koziarski	2012-05-07	1	-4/+0
\|\ \ \| \| \| \| \| \|	Removed ActiveSupport#load_all!
\| * \|	Removed ActiveSupport#load_all!	Pan Thomakos	2012-03-18	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is no longer used and actually raises an error when trying to load `ActiveSupport::Dependencies`. I removed the related code and added the `Dependencies` module to the autoload list.
* \| \|	Merge pull request #6064 from gazay/fix_guides_for_as_core_ext	Xavier Noria	2012-05-07	1	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \|	Fix guides for as core ext
\| * \| \|	Changes for numeric api for Time because Time.current works different	Alexey Gaziev	2012-05-07	1	-3/+3
\| \| \| \|
* \| \| \|	Keep all methods in object/deep_dup	Piotr Sarnacki	2012-05-06	5	-16/+16
\| \| \| \|
* \| \| \|	Nice logic for deep_dup in rails	Alexey Gaziev	2012-05-06	5	-4/+16
\| \| \| \|
* \| \| \|	Merge pull request #6169 from marcandre/respond_to_missing	José Valim	2012-05-05	3	-6/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Respond to missing
\| * \| \| \|	Use respond_to_missing for TimeWithZone	Marc-Andre Lafortune	2012-05-05	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	Use respond_to_missing? for Chars	Marc-Andre Lafortune	2012-05-05	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Use respond_to_missing? for OrderedOptions	Marc-Andre Lafortune	2012-05-05	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	added beginning_of_hour support to core_ext calculations for Time and DateTime	Mark J. Titorenko	2012-05-04	2	-0/+26
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Merge pull request #4452 from tapajos/e5425c8f68fbb720fcbf4b14e1f154ac27dbbbed	Aaron Patterson	2012-05-03	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix cache (FileStore) clear to keep .gitkeep.
\| * \| \| \|	Cache (FileStore) clear should keep .gitkeep	Marcos Tapajos	2012-01-13	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #4496 from makeable/master	Aaron Patterson	2012-05-03	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Active Support Cache - race_condition_ttl should be an integer
\| * \| \| \| \|	race_condition_ttl should be an integer	Matt Williams	2012-01-17	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	BigDecimal string wrapping in JSON serialization can now be opted-out, fixes ↵	David FRANCOIS	2012-05-02	1	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#6033
* \| \| \| \| \|	Merge pull request #6096 from ↵	Piotr Sarnacki	2012-05-01	1	-1/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	hasclass/as_json__encode_infinite_and_nan_bigdecimals_as_null JSON: encode BigDecimal NaN/Infinity as null.
\| * \| \| \| \| \|	JSON: encode BigDecimal NaN/Infinity as null.	Sebi Burkhard	2012-05-01	1	-1/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	more edits [ci skip]	Vijay Dev	2012-05-01	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	copy edit AS deprecation/behaviours docs [ci skip]	Vijay Dev	2012-05-01	1	-22/+11
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-05-01	5	-3/+23
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Add documention for utc_offset method	Rob Zolkos	2012-05-01	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Minor English fix.	Erich Menge	2012-04-30	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Document ActiveSupport::Deprecations.behavior	twinturbo	2012-04-29	1	-1/+19
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	twinturbo	2012-04-28	22	-75/+127
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	fix typo in ActiveSupport::Inflector#titleize	Francesco Rodriguez	2012-04-28	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Document exception handling inside resce_from handlers	twinturbo	2012-04-28	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2532 from ↵	Piotr Sarnacki	2012-04-30	1	-0/+4
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	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 #5177 from cap10morgan/fix-gh-issue-4374	José Valim	2012-04-30	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix inflector bug where -ice gets singularized into -ouse
\| * \| \| \| \| \| \| \| \|	fix inflector bug where -ice gets pluralized into -ouse	Wes Morgan	2012-02-25	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This should happen for mouse or louse, but not slice or pumice.
* \| \| \| \| \| \| \| \| \|	Merge pull request #6074 from mark-rushakoff/unused-variables	Jeremy Kemper	2012-04-29	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove some unused variable assignments
\| * \| \| \| \| \| \| \| \| \|	Remove unused assignments	Mark Rushakoff	2012-04-29	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #5999 from bogdan/callbacks	Jeremy Kemper	2012-04-29	1	-7/+7
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	AS::Callbacks#run_callbacks optimized to reduce backtrace
\| * \| \| \| \| \| \| \| \|	AS::Callbacks optimized to reduce call backtrace	Bogdan Gusiev	2012-04-27	1	-7/+7
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #6044 from gazay/tests_for_string_truncate_w_regexp_separator	José Valim	2012-04-29	1	-1/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tests for regexp separator in String#truncate
\| * \| \| \| \| \| \| \| \|	Tests for regexp separator in String#truncate	Alexey Gaziev	2012-04-29	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/rails/rails/commit/5a7513593f64e0ff7e4de1ee37bac5eeddfae270
* \| \| \| \| \| \| \| \| \|	Merge pull request #5986 from carlosantoniodasilva/deprecation-behavior-silence	José Valim	2012-04-29	1	-2/+10
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Add a "silence" behavior to completely turn off deprecation warnings.
\| * \| \| \| \| \| \| \| \|	Document #behavior= and update CHANGELOG	twinturbo	2012-04-28	1	-0/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add a "silence" behavior to completely turn off deprecation warnings.	Adam Hawkins	2012-04-28	1	-2/+3
\| \|/ / / / / / / /