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

	Commit message (Expand)	Author	Age	Files	Lines
*	Fix for time type columns with invalid time	Adam Meehan	2012-09-05	2	-1/+19
*	Merge pull request #7530 from robin850/master	Xavier Noria	2012-09-05	1	-1/+1
\|\
\| *	Fix a typo	Robin Dupret	2012-09-05	1	-1/+1
* \|	Merge pull request #7519 from leocassarani/merge-with-block	Rafael Mendonça França	2012-09-04	3	-6/+50
\|\ \
\| * \|	Extend HashWithIndifferentAccess#update to take an optional block	Leo Cassarani	2012-09-05	3	-6/+50
\|/ /
* \|	Merge pull request #7522 from lexmag/mime_type	Rafael Mendonça França	2012-09-04	2	-85/+94
\|\ \
\| * \|	Refactor `Mime::Type`	Aleksey Magusev	2012-09-05	2	-85/+94
* \| \|	We dont need to include the name and the format in the digest -- source is au...	David Heinemeier Hansson	2012-09-04	1	-1/+1
* \| \|	Merge pull request #7422 from ernie/improvements-to-improved-routing	David Heinemeier Hansson	2012-09-04	3	-14/+103
\|\ \ \
\| * \| \|	Make enhanced routing Concerns more tell-don't-ask	Ernie Miller	2012-09-03	2	-37/+70
\| * \| \|	Fix concerns not executing block in mapper	Ernie Miller	2012-09-03	2	-2/+29
\| * \| \|	Allow routing concerns to accept a callable	Ernie Miller	2012-09-03	3	-5/+34
* \| \| \|	revised the exception message "Expected #{file_path} to define #{qualified_na...	Xavier Noria	2012-09-04	1	-1/+1
* \| \| \|	Merge pull request #7515 from senny/custom_inheritance_column_test_refactoring	Rafael Mendonça França	2012-09-03	9	-65/+66
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	test cleanup, remove ruby_type because it's no longer needed	Yves Senn	2012-09-03	7	-16/+5
\| * \| \|	rewrite inheritance tests with a custom inheritance_column	Yves Senn	2012-09-03	4	-49/+61
\|/ / /
* \| \|	Merge pull request #7506 from senny/issue_7503	Rafael Mendonça França	2012-09-03	5	-2/+38
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	set the configured #inheritance_column on #become (#7503)	Yves Senn	2012-09-03	5	-2/+38
* \| \|	Merge pull request #7502 from xoen/fixed-upgrading-guide-markup	Carlos Antonio da Silva	2012-09-02	1	-2/+12
\|\ \ \
\| * \| \|	Fixed markup in Upgrading RoR guide [ci skip]	Aldo "xoen" Giambelluca	2012-09-02	1	-2/+12
\| \|/ /
* \| \|	Merge pull request #7504 from behrends/patch-1	Carlos Antonio da Silva	2012-09-02	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix example code: use tasks instead of comments	Erik Behrends	2012-09-02	1	-1/+1
\|/ /
* \|	Merge pull request #7495 from steveklabnik/issue_7478	Aaron Patterson	2012-09-01	3	-4/+18
\|\ \
\| * \|	Force reloading of the session after destroy	Andreas Loupasakis	2012-09-01	1	-0/+3
\| * \|	Override rack's destroy_session in cookie store	Andreas Loupasakis	2012-09-01	1	-0/+8
\| * \|	Assign a new session_id to session options hash	Andreas Loupasakis	2012-09-01	1	-2/+2
\| * \|	Properly reset the session on reset_session	Steve Klabnik	2012-08-31	1	-2/+5
* \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-09-01	17	-36/+111
\|\ \ \
\| * \| \|	copy edits [ci skip]	Vijay Dev	2012-09-01	2	-4/+2
\| * \| \|	Revert "added .DS_Store to .gitignore"	Vijay Dev	2012-09-01	1	-1/+0
\| * \| \|	reverting changes from commit b0896c38	Sven Kraeuter \| 5v3n	2012-09-01	1	-1/+1
\| * \| \|	Fix comment about Session.	Steve Klabnik	2012-08-31	1	-1/+1
\| * \| \|	Fix my bio	Pratik Naik	2012-08-31	1	-1/+1
\| * \| \|	Merge pull request #111 from 5v3n/master	Sven Kräuter	2012-08-31	1	-1/+1
\| \|\ \ \
\| \| * \| \|	there is no "delete" action in a controller	Sven Kräuter	2012-08-31	1	-1/+1
\| \|/ / /
\| * \| \|	In example about params naming conventions use params[:person] [ci skip]	Aldo "xoen" Giambelluca	2012-08-31	1	-1/+1
\| * \| \|	Merge pull request #106 from neilstockbridge/master	Jeff Shantz	2012-08-30	1	-1/+1
\| \|\ \ \
\| \| * \| \|	Added a note for smtp_settings.enable_starttls_auto	Neil Stockbridge	2012-08-08	1	-1/+1
\| * \| \| \|	in section 4.1 acts_as_yaffle_test was incorrectly failing due to assertion i...	Kevin Musiorski	2012-08-30	1	-2/+2
\| * \| \| \|	added .DS_Store to .gitignore	Kevin Musiorski	2012-08-30	1	-0/+1
\| * \| \| \|	Added example of using options_for_select() with select_tag()	Kir Shatrov	2012-08-30	1	-0/+4
\| * \| \| \|	Removed spaces between name and asterisks in example CHANGELOG entry [ci skip]	Aldo "xoen" Giambelluca	2012-08-30	1	-1/+1
\| * \| \| \|	Expand documentation for change() method in Time, Date, and DateTime	Jeff Shantz	2012-08-29	3	-4/+15
\| * \| \| \|	Revert "Grammar"	Jo Liss	2012-08-30	1	-3/+3
\| * \| \| \|	Grammar	Jo Liss	2012-08-29	1	-3/+3
\| * \| \| \|	Merge pull request #110 from nmadura/master	Nathaniel Madura	2012-08-29	1	-0/+3
\| \|\ \ \ \
\| \| * \| \| \|	added a touch more information to the apache configuration instructions	Nathaniel Madura	2012-08-29	1	-0/+3
\| \|/ / / /
\| * \| \| \|	Merge pull request #109 from aantix/default_security_headers_clarifications	Jim Jones	2012-08-28	1	-1/+19
\| \|\ \ \ \
\| \| * \| \| \|	Added clairifications for default security headers.	Jim Jones	2012-08-27	1	-1/+19
\| \|/ / / /
\| * \| \| \|	Merge pull request #108 from homakov/master	Egor Homakov	2012-08-27	1	-0/+23
\| \|\ \ \ \