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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\| * \|	Do get it right this time. Fixing the documentation around :dependent => :res...	Aditya Sanghi	2012-02-18	1	-5/+5
\| * \|	Add note about Rails 4.0 changes	Aditya Sanghi	2012-02-18	1	-0/+4
\| * \|	Add a note about :dependent => :restrict on has_one and has_many's options	Aditya Sanghi	2012-02-18	1	-0/+2
\| * \|	Update Time#change docs to reflect the options it uses	Eric Oestrich	2012-02-17	1	-1/+1
\| * \|	[engines guide] basic revision/review work	Ryan Bigg	2012-02-16	1	-31/+89
\| * \|	[engines guide] Clean up explanation for routing methods	Ryan Bigg	2012-02-16	1	-5/+17
\| * \|	[engines guide] Elaborate on isolate_namespace functionality	Ryan Bigg	2012-02-16	1	-1/+7
\| * \|	update engines guide to explicitly reference relative-to-engine-root-path for...	Ryan Bigg	2012-02-16	1	-1/+1
\| * \|	[engines guide] Revise draft of guide, add testing, assets and dependencies s...	Ryan Bigg	2012-02-16	1	-25/+63
\| * \|	Rails::Engine docs should use helper method, not helpers	Ryan Bigg	2012-02-16	1	-1/+1
\| * \|	Fix AM block_format helper method description	Alexey Vakhov	2012-02-15	1	-2/+1
\| * \|	Update f.button docs to reflect real label implementation	Carlos Antonio da Silva	2012-02-14	1	-5/+5
\| * \|	fix spacer template example	Sergey Nartimov	2012-02-12	1	-1/+1
\| * \|	Cosmetic fix in AM readme	Alexey Vakhov	2012-02-12	1	-1/+1
\| * \|	Change AR validation guide to remove ordered hash mention related to AMo::Errors	Carlos Antonio da Silva	2012-02-09	1	-1/+1
\| * \|	Fixed styles when browser is narrower than 69em.	Jeff Dickey	2012-02-09	1	-0/+1
* \| \|	Merge pull request #3479 from arvida/ensure-date-header-on-expires-in	José Valim	2012-02-18	3	-0/+24
\|\ \ \
\| * \| \|	Ensuring a HTTP Date header when setting Cache-Control's max-age with #expire...	arvida	2011-10-31	1	-0/+3
\| * \| \|	Added accessor methods for Date header	arvida	2011-10-31	1	-0/+14
\| * \| \|	Added test for setting of HTTP Date header when calling #expires_in	arvida	2011-10-31	1	-0/+7
* \| \| \|	Merge pull request #5076 from petmit/migrate_status_without_timestamps	Aaron Patterson	2012-02-17	2	-3/+52
\|\ \ \ \
\| * \| \| \|	Correctly print names of non-timestamped migrations with db:migrate:status	Peter Mitchell	2012-02-17	2	-3/+52
\|/ / / /
* \| \| \|	Simplify regexp	Andrew White	2012-02-17	1	-1/+1
* \| \| \|	Fix ActionDispatch::Static to serve files with unencoded PCHAR	Andrew White	2012-02-17	14	-4/+48
* \| \| \|	let expires_in accept a must_revalidate flag	Xavier Noria	2012-02-17	3	-2/+29
* \| \| \|	Merge pull request #5066 from lest/patch-1	José Valim	2012-02-17	3	-1/+6
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	escape static file path to prevent double unescaping	Sergey Nartimov	2012-02-16	3	-1/+6
* \| \| \|	use Process.pid rather than $$	Aaron Patterson	2012-02-16	3	-7/+7
* \| \| \|	database connections are automatically established after forking.	Aaron Patterson	2012-02-16	3	-14/+73
* \| \| \|	Fix tests, Rails.env may be different on CI	Piotr Sarnacki	2012-02-16	1	-2/+5