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

	Commit message (Expand)	Author	Age	Files	Lines
*	#read_entry in ActiveSupport::Cache::FileStore should log details of the exce...	Winston	2012-02-22	2	-1/+11
*	Merge pull request #5124 from bquorning/prefer-\|\|-over-'or'-for-boolean-opera...	José Valim	2012-02-22	1	-1/+1
\|\
\| *	Prefer \|\| over 'or' for boolean operations	Benjamin Quorning	2012-02-22	1	-1/+1
\|/
*	bumping up arel	Aaron Patterson	2012-02-21	1	-1/+1
*	prepared statements can be disabled	Aaron Patterson	2012-02-21	8	-30/+56
*	Merge pull request #5118 from castlerock/ordered_options_from_hash	Santiago Pastorino	2012-02-21	1	-3/+1
\|\
\| *	ordered_options will work if inherited from Hash, remove OrderedHash usage	Vishnu Atrai	2012-02-21	1	-3/+1
* \|	more ruby 2.0 respond_to? changes	Aaron Patterson	2012-02-21	1	-1/+1
* \|	ruby 2.0 makes protected methods return false for respond_to, so pass true as...	Aaron Patterson	2012-02-21	1	-1/+1
* \|	fix bad docs from f373f296 [ci skip]	Vijay Dev	2012-02-21	1	-3/+3
* \|	Don't wrap the raise with ensure	Santiago Pastorino	2012-02-21	2	-10/+12
\|/
*	Merge pull request #5108 from mirakui/patch-1	Aaron Patterson	2012-02-21	1	-1/+1
\|\
\| *	Bug: cache_path.size doesn't return length of filename but size of file if ca...	Issei Naruta	2012-02-21	1	-1/+1
* \|	Merge pull request #5116 from rubenfonseca/delete_with_block_refactor	Aaron Patterson	2012-02-21	2	-2/+2
\|\ \
\| * \|	Refactored two methods to use delete with a block	Ruben Fonseca	2012-02-21	2	-2/+2
\|/ /
* \|	Restore lookup formats to the previous value after searching for the failing ...	Santiago Pastorino	2012-02-21	2	-2/+5
* \|	Merge pull request #5112 from nupurjain/activesupport_cache_refactor	Santiago Pastorino	2012-02-21	1	-5/+1
\|\ \ \| \|/ \|/\|
\| *	suggested changes.	Nupur Jain	2012-02-21	1	-5/+1
* \|	Merge pull request #5107 from rubenfonseca/stylesheet_link_tag_refactor	Jon Leighton	2012-02-21	1	-3/+3
\|\ \
\| * \|	use Hash#delete on styelsheet_link_tag	Ruben Fonseca	2012-02-21	1	-3/+3
\|/ /
* \|	Merge pull request #5033 from markmcspadden/inherited_headers	Jeremy Kemper	2012-02-20	2	-0/+41
\|\ \
\| * \|	Remove double test for header inheritance leaks	Mark McSpadden	2012-02-14	1	-11/+0
\| * \|	Allow ActiveResource subclasses to inherit headers from parent	Mark McSpadden	2012-02-13	2	-0/+52
* \| \|	tag bind params with a bind param object	Aaron Patterson	2012-02-20	3	-3/+3
* \| \|	use Hash#delete with a default block	Aaron Patterson	2012-02-20	1	-3/+3
* \| \|	Merge pull request #5102 from nashby/form-option-refactor	José Valim	2012-02-20	2	-28/+29
\|\ \ \
\| * \| \|	refactor options_for_select	Vasiliy Ermolovich	2012-02-20	2	-23/+24
\| * \| \|	refactor grouped_options_for_select	Vasiliy Ermolovich	2012-02-20	1	-5/+5
* \| \| \|	Fix a failing test	Santiago Pastorino	2012-02-20	1	-0/+2
* \| \| \|	Use the right format when a partial is missing.	Santiago Pastorino	2012-02-20	3	-0/+9
* \| \| \|	Merge pull request #5101 from ckdake/ckdake_actionview_handler_reset	José Valim	2012-02-20	2	-0/+7
* \| \| \|	search private / protected methods in trunk ruby	Aaron Patterson	2012-02-20	1	-1/+1
\|/ / /
* \| \|	Merge pull request #5082 from willbryant/assigns_should_not_stringify_values_...	Aaron Patterson	2012-02-20	2	-1/+7
\|\ \ \
\| * \| \|	assigns(:foo) should not convert @foo's keys to strings if it happens to be a...	Will Bryant	2012-02-18	2	-1/+7
* \| \| \|	Merge pull request #5096 from lawso017/master	Aaron Patterson	2012-02-20	2	-19/+43
\|\ \ \ \
\| * \| \| \|	removed commented line. 3434 tests, 10531 assertions, 0 failures, 0 errors, 3...	William Lawson	2012-02-20	1	-1/+0
\| * \| \| \|	Restored ability to identify ID and Sequence from tables relying on a nonmatc...	William Lawson	2012-02-20	2	-19/+44
* \| \| \| \|	Merge pull request #5083 from nashby/grouped-select-options	José Valim	2012-02-20	2	-1/+24
\|\ \ \ \ \
\| * \| \| \| \|	add selected and disabled option to grouped select	Vasiliy Ermolovich	2012-02-18	2	-1/+24
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #5075 from bogdan/json_full_messages	José Valim	2012-02-20	3	-3/+26
\|\ \ \ \ \
\| * \| \| \| \|	AM::Errors: allow :full_messages parameter for #as_json	Bogdan Gusiev	2012-02-20	3	-3/+26
* \| \| \| \| \|	Remove fixture files with Windows incompatible filenames	Andrew White	2012-02-20	13	-38/+88
* \| \| \| \| \|	Integration tests support the OPTIONS http method	Jeremy Kemper	2012-02-19	3	-2/+26
\| \|_\|/ / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #5085 from simi/patch-1	Vijay Dev	2012-02-18	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Update activerecord/CHANGELOG.md	Josef Šimánek	2012-02-18	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-02-18	12	-62/+281
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	fix some typos [ci skip]	Vijay Dev	2012-02-18	1	-3/+3
\| * \| \| \|	Documenting the :inverse_of option for associations	Mike Gunderloy	2012-02-18	1	-0/+99
\| * \| \| \|	Fix actionpack readme weblog example	Alexey Vakhov	2012-02-18	1	-1/+1
\| * \| \| \|	Fix AbstractController::Base#hidden_actions comment	Alexey Vakhov	2012-02-18	1	-2/+2