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	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
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #5996 from gazay/remove_excess_selfs	Jeremy Kemper	2012-04-28	41	-324/+473
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Active Support housekeeping and polish
\| * \| \| \| \| \| \| \|	String quotes and trailing spaces	Alexey Gaziev	2012-04-29	21	-126/+126
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Indentation for private methods	Alexey Gaziev	2012-04-29	2	-20/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/rails/rails/commit/e7d55f734aae204115d0a04a2db774ac364c1312
\| * \| \| \| \| \| \| \|	AS core_ext refactoring pt.2	Alexey Gaziev	2012-04-29	20	-86/+110
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	AS core_ext refactoring	Alexey Gaziev	2012-04-29	15	-93/+220
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #5880 from asanghi/master	Jeremy Kemper	2012-04-25	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Stamp out ruby-debug with debugger everywhere else in the code base
\| * \| \| \| \| \| \| \|	and one more time	Aditya Sanghi	2012-04-24	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	another attempt at the language	Aditya Sanghi	2012-04-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	review changes for #5875	Aditya Sanghi	2012-04-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	stamp out ruby-debug19 with extreme prejudice :)	Aditya Sanghi	2012-04-17	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Remove circular require of time/zones	Oscar Del Ben	2012-04-21	1	-1/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Remove unused code. We should use 'active_support/time'.	kennyj	2012-04-19	1	-5/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-04-18	1	-5/+32
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add documentation to detail passing of an object as the second	Michael de Silva	2012-04-13	1	-0/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	parameter passed to the ActiveSupport::Notifications.subscribe method instead of a block Example code sample and output is provided as well.
\| * \| \| \| \| \| \| \|	Fix further typos in ActiveSupport::Notifications	Michael de Silva	2012-04-13	1	-4/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix rdoc typo in ActiveSupport::Notifications	Michael de Silva	2012-04-13	1	-1/+1
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	fixed broken build after multi_json upgrade	Arun Agrawal	2012-04-16	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Multi_json also upgraded.
* \| \| \| \| \| \| \|	Require for time_with_zone should stay in core_ext/time_zones :bomb:	Piotr Sarnacki	2012-04-15	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add missing require in Active Support time zones (fixes #5854)	Piotr Sarnacki	2012-04-15	1	-1/+1
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I also removed the other require as it's already present in `activesupport/core_ext/time/calculations`
* \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-04-12	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	fix doc for ActiveSupport::Callbacks::Callback#define_conditional_callback	Jan Xie	2012-04-08	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Remove Module#delegate!	Daniel Schierbeck	2012-04-12	1	-52/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add back the old `deprecate` method as `deprecate!`	Daniel Schierbeck	2012-04-12	1	-0/+52
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Change API docs regarding delegation to non-public methods	Daniel Schierbeck	2012-04-12	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Optimize the performance of #delegate	Daniel Schierbeck	2012-04-12	1	-9/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the use of #__send__ in order to boost performance. This also means that you can no longer delegate to private methods on the target object.
* \| \| \| \| \| \| \|	Inline the symbolize_keys/stringify_keys methods	Santiago Pastorino	2012-04-08	1	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	user system total real symbolize_keys 5.980000 0.070000 6.050000 ( 6.048187) new_symbolize_keys 4.310000 0.050000 4.360000 ( 4.364745)
* \| \| \| \| \| \| \|	Remove Fixnum#to_sym support in 1.8.7	Santiago Pastorino	2012-04-08	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	update stdlib doc urls in comments - ↵	Trevor Wennblom	2012-04-07	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	active_support/core_ext/[integer\|numeric]/time.rb http://stdlib.rubyonrails.org/ last updated in 2005
* \| \| \| \| \| \| \|	revises the regexp used in titleize	Xavier Noria	2012-04-07	1	-1/+1
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The regexp used in titleize matches saxon genitive and other contractions, only to call capitalize on the captured text and have the apostrophe upcased which yields the apostrophe itself. It is more clear that the regexp matches just what it has to match.
* \| \| \| \| \| \|	revises requires of some AS deprecation files	Xavier Noria	2012-04-05	3	-3/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Initialize variables in file update checker to avoid warnings	Carlos Antonio da Silva	2012-04-05	1	-0/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Remove not used require from as to avoid circular requires	Carlos Antonio da Silva	2012-04-05	1	-1/+0
\| \| \| \| \| \| \|