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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \| \|	Merge pull request #10074 from trevorturk/remove-fixme-comments-about-legacy-...	Rafael Mendonça França	2013-04-03	4	-4/+0
\|\ \ \ \ \
\| * \| \| \| \|	Remove comments about removing LegacyKeyGenerator in 4.1	Trevor Turk	2013-04-03	4	-4/+0
* \| \| \| \| \|	Merge pull request #9932 from senny/9913_routing_problem	Andrew White	2013-04-03	2	-8/+41
\|\ \ \ \ \ \
\| * \| \| \| \| \|	routing shorthand syntax works with multiple paths	Yves Senn	2013-03-26	2	-5/+20
\| * \| \| \| \| \|	bugfix, when matching multiple paths with `get`, `post`, ...	Yves Senn	2013-03-26	2	-3/+21
* \| \| \| \| \| \|	fix regression in Mapper when `format:` was used in a `scope`.	Yves Senn	2013-04-03	2	-1/+23
\| \|_\|/ / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Fix grammatical error on JS helper warning message	thenickcox	2013-04-02	1	-2/+2
* \| \| \| \| \|	Getting rid of a few other vestiges of rails.png.	Steve Klabnik	2013-04-02	1	-0/+0
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #10061 from trevorturk/dummy-key-generator-rename	Santiago Pastorino	2013-04-02	5	-13/+13
\|\ \ \ \ \
\| * \| \| \| \|	Rename DummyKeyGenerator -> LegacyKeyGenerator	Trevor Turk	2013-04-02	5	-13/+13
* \| \| \| \| \|	:scissors: spacing after private	Trevor Turk	2013-04-02	1	-3/+0
* \| \| \| \| \|	Be consistent when talking about cookies, key -> name	Trevor Turk	2013-04-02	1	-25/+25
* \| \| \| \| \|	Fix permanent cookie jar accessor typo	Trevor Turk	2013-04-02	2	-2/+7
\|/ / / / /
* \| \| \| \|	Merge pull request #10054 from rubys/use_find_by_in_rdoc	Santiago Pastorino	2013-04-02	3	-4/+4
\|\ \ \ \ \
\| * \| \| \| \|	Prefer find_by over dynamic finders in rdoc	Sam Ruby	2013-04-02	3	-4/+4
* \| \| \| \| \|	each_with_index => each as we dont use index	Vipul A M	2013-04-03	1	-1/+1
\|/ / / / /
* \| \| \| \|	Fixed typo on AP dispatch Mime::Type test	KalabiYau	2013-04-01	1	-1/+1
* \| \| \| \|	Improve documentation around the cookie store auto-upgrade to encryption	Trevor Turk	2013-04-01	1	-22/+37
* \| \| \| \|	Merge pull request #9978 from trevorturk/cookie-store-auto-upgrade	Santiago Pastorino	2013-04-01	5	-78/+162
\|\ \ \ \ \
\| * \| \| \| \|	Allow transparent upgrading of legacy signed cookies to encrypted cookies; Au...	Trevor Turk	2013-03-28	5	-78/+162
* \| \| \| \| \|	typo recomend -> recommend	ogawaso	2013-04-01	1	-2/+2
* \| \| \| \| \|	Merge pull request #9680 from bdmac/time-zone-options-revert-grep-to-select	Carlos Antonio da Silva	2013-03-31	2	-4/+23
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add regression test for TZ grep	Brian McManus	2013-03-27	1	-0/+20
\| * \| \| \| \| \|	Revert grep to select since they are not the same	Brian McManus	2013-03-27	2	-4/+3
* \| \| \| \| \| \|	Merge pull request #10013 from vipulnsward/fix_request_method_test	Santiago Pastorino	2013-03-31	1	-6/+2
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	fix request methods test	Vipul A M	2013-03-31	1	-6/+2
* \| \| \| \| \| \| \|	Merge pull request #10015 from vipulnsward/remove_unused_variable_in_get	Steve Klabnik	2013-03-31	2	-2/+2
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	remove unused variable and assignment	Vipul A M	2013-03-31	2	-2/+2
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #10014 from vipulnsward/remove_unused_match_var	Steve Klabnik	2013-03-31	1	-8/+8
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	remove unused match variables in selector	Vipul A M	2013-03-31	1	-8/+8
\| \|/ / / / / / /
* / / / / / / /	fix wrong argument error message	Vipul A M	2013-03-31	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Improve AP changelog entry about layout method with nil return	Carlos Antonio da Silva	2013-03-30	1	-4/+4
* \| \| \| \| \| \|	Fix typos in AP: "overriden" => "overridden"	Carlos Antonio da Silva	2013-03-30	5	-36/+36
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2013-03-30	6	-84/+32
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Fix typo	Carson McDonald	2013-03-26	1	-1/+1
\| * \| \| \| \|	Reverted code change introduced in d45145acdc576e46a1f1719d69bec96b5bf07b0a	Prathamesh Sonpatki	2013-03-24	2	-2/+2
\| * \| \| \| \|	Changed 'args' to 'arguments' when used in places other than code with fixing...	Prathamesh Sonpatki	2013-03-24	2	-2/+2
\| * \| \| \| \|	Remove duplicated accepts_nested_attributes description	ma2gedev	2013-03-22	1	-16/+0
\| * \| \| \| \|	Undo bad change in cf0931166be13dbbe660	Steve Klabnik	2013-03-19	1	-1/+1
\| * \| \| \| \|	Fixed small typos	Prathamesh Sonpatki	2013-03-19	2	-2/+2
\| * \| \| \| \|	The HTTP method helpers are preferred over match and should be explained befo...	Trevor Turk	2013-03-18	1	-28/+16
\| * \| \| \| \|	The default route has been removed	Trevor Turk	2013-03-18	1	-24/+0
\| * \| \| \| \|	Using match without via is deprecated	Trevor Turk	2013-03-18	1	-12/+12
\| * \| \| \| \|	Capitalize the first letter of sentence	Tatsuro Baba	2013-03-18	1	-1/+1
\| * \| \| \| \|	Remove :all from *args options in AbstractController.helper	Bryan Ricker	2013-03-16	1	-1/+1
* \| \| \| \| \|	Removed unused variable in proc	Prathamesh Sonpatki	2013-03-28	1	-1/+1
* \| \| \| \| \|	Merge pull request #9967 from choudhuryanupam/fix_actionpack_test_cases	Carlos Antonio da Silva	2013-03-28	2	-3/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Refactored to remove unused variable	Anupam Choudhury	2013-03-28	2	-3/+3
\| \| \|/ / / / \| \|/\| \| \| \|
* / \| \| \| \|	Fixed grammar	Anupam Choudhury	2013-03-28	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #8458 from lucisferre/improve-layout-override-fallback-beh...	Rafael Mendonça França	2013-03-27	4	-5/+68
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|