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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #9932 from senny/9913_routing_problem	Andrew White	2013-04-03	1	-8/+12
\|\
\| *	routing shorthand syntax works with multiple paths	Yves Senn	2013-03-26	1	-5/+6
\| *	bugfix, when matching multiple paths with `get`, `post`, ...	Yves Senn	2013-03-26	1	-3/+6
* \|	fix regression in Mapper when `format:` was used in a `scope`.	Yves Senn	2013-04-03	1	-1/+1
* \|	Fix grammatical error on JS helper warning message	thenickcox	2013-04-02	1	-2/+2
* \|	Merge pull request #10061 from trevorturk/dummy-key-generator-rename	Santiago Pastorino	2013-04-02	1	-1/+1
\|\ \
\| * \|	Rename DummyKeyGenerator -> LegacyKeyGenerator	Trevor Turk	2013-04-02	1	-1/+1
* \| \|	: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	1	-1/+1
\|/ /
* \|	Prefer find_by over dynamic finders in rdoc	Sam Ruby	2013-04-02	3	-4/+4
* \|	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	3	-76/+78
\|\ \
\| * \|	Allow transparent upgrading of legacy signed cookies to encrypted cookies; Au...	Trevor Turk	2013-03-28	3	-76/+78
* \| \|	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	1	-1/+1
\|\ \ \
\| * \| \|	Revert grep to select since they are not the same	Brian McManus	2013-03-27	1	-1/+1
* \| \| \|	Merge pull request #10015 from vipulnsward/remove_unused_variable_in_get	Steve Klabnik	2013-03-31	1	-1/+1
\|\ \ \ \
\| * \| \| \|	remove unused variable and assignment	Vipul A M	2013-03-31	1	-1/+1
* \| \| \| \|	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
\|/ / / /
* \| \| \|	Fix typos in AP: "overriden" => "overridden"	Carlos Antonio da Silva	2013-03-30	1	-1/+1
* \| \| \|	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
\| * \| \|	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
* \| \| \|	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	1	-5/+9
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Provides standard layout lookup behavior for method and proc cases	Chris Nicola	2013-03-27	1	-5/+9
* \| \|	if cookie is tampered with then nil is returned [ci skip]	Neeraj Singh	2013-03-25	1	-4/+2
* \| \|	Introduce UpgradeLegacySignedCookieJar to transparently upgrade existing sign...	Trevor Turk	2013-03-24	1	-99/+99
* \| \|	Merge pull request #9704 from trevorturk/warn-about-skipped-routes	Jeremy Kemper	2013-03-24	1	-1/+9
\|\ \ \
\| * \| \|	Tweak exception message to avoid giving potentially misleading suggestions	Trevor Turk	2013-03-20	1	-2/+3
\| * \| \|	Raise an ArgumentError when a clashing named route is defined	Trevor Turk	2013-03-19	1	-1/+8
* \| \| \|	Fix some typos	Vipul A M	2013-03-24	2	-2/+2
* \| \| \|	Merge pull request #8501 from charliesome/version-to-s	Rafael Mendonça França	2013-03-23	1	-6/+7
\|\ \ \ \
\| * \| \| \|	Add version method to top level modules	Charlie Somerville	2013-03-21	1	-6/+7
* \| \| \| \|	Fix documentation markup [ci skip]	Rafael Mendonça França	2013-03-23	1	-0/+2
* \| \| \| \|	StringIO is not required by default in JRuby	Arun Agrawal	2013-03-22	1	-0/+1
\|/ / / /
* \| \| \|	Merge pull request #9802 from newsline/fix-broken-action-missing	Rafael Mendonça França	2013-03-20	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix broken ActionController#action_missing	Janko Luin	2013-03-20	1	-1/+1
* \| \| \|	Merge pull request #9794 from schneems/schneems/email-host	Andrew White	2013-03-19	1	-1/+12
\|\ \ \ \
\| * \| \| \|	Fix improperly configured host in generated urls	schneems	2013-03-19	1	-1/+12
\| \|/ / /