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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \|	Add url generation tests for #10185	Andrew White	2013-04-18	1	-0/+2
* \|	Passing subdomain: '' to url_for removes the subdomain (instead of adding a l...	Derek Watson	2013-04-18	2	-0/+27
* \|	Avoid leak into controller's action_methods	printercu	2013-04-18	1	-0/+6
* \|	options_from_collection_for_select helper takes html attributes	Vasiliy Ermolovich	2013-04-11	1	-0/+7
* \|	Merge pull request #9604 from sgrif/live_streaming_exceptions	Rafael Mendonça França	2013-04-08	1	-1/+75
\|\ \
\| * \|	Exception handling for controllers using ActionController::Live	Sean Griffin	2013-03-18	1	-1/+75
* \| \|	Fix explicit names on multiple file fields	Ryan McGeary	2013-04-05	1	-0/+10
* \| \|	Fix indent and remove extra white spaces	Carlos Antonio da Silva	2013-04-05	1	-15/+17
* \| \|	Ensure mail_to helper does not modify the given html options hash	Carlos Antonio da Silva	2013-04-04	1	-1/+7
* \| \|	Merge pull request #10065 from spohlenz/mail_to_block	Carlos Antonio da Silva	2013-04-04	1	-0/+10
\|\ \ \
\| * \| \|	Add block support for the helper	Sam Pohlenz	2013-04-03	1	-0/+10
* \| \| \|	Fix typo in view name	Carlos Antonio da Silva	2013-04-03	2	-1/+1
* \| \| \|	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	1	-0/+29
\|\ \ \ \ \
\| * \| \| \| \|	routing shorthand syntax works with multiple paths	Yves Senn	2013-03-26	1	-0/+14
\| * \| \| \| \|	bugfix, when matching multiple paths with `get`, `post`, ...	Yves Senn	2013-03-26	1	-0/+15
* \| \| \| \| \|	fix regression in Mapper when `format:` was used in a `scope`.	Yves Senn	2013-04-03	1	-0/+22
\| \|_\|/ / / \|/\| \| \| \|
* \| \| \| \|	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	4	-12/+12
\|\ \ \ \
\| * \| \| \|	Rename DummyKeyGenerator -> LegacyKeyGenerator	Trevor Turk	2013-04-02	4	-12/+12
* \| \| \| \|	Fix permanent cookie jar accessor typo	Trevor Turk	2013-04-02	1	-1/+6
\|/ / / /
* \| \| \|	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
* \| \| \|	Merge pull request #9978 from trevorturk/cookie-store-auto-upgrade	Santiago Pastorino	2013-04-01	1	-2/+73
\|\ \ \ \
\| * \| \| \|	Allow transparent upgrading of legacy signed cookies to encrypted cookies; Au...	Trevor Turk	2013-03-28	1	-2/+73
* \| \| \| \|	Merge pull request #9680 from bdmac/time-zone-options-revert-grep-to-select	Carlos Antonio da Silva	2013-03-31	1	-3/+22
\|\ \ \ \ \
\| * \| \| \| \|	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	1	-3/+2
* \| \| \| \| \|	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
* \| \| \| \| \| \|	remove unused variable and assignment	Vipul A M	2013-03-31	1	-1/+1
\|/ / / / / /
* \| / / / /	Fix typos in AP: "overriden" => "overridden"	Carlos Antonio da Silva	2013-03-30	4	-35/+35
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Refactored to remove unused variable	Anupam Choudhury	2013-03-28	2	-3/+3
\|/ / / /
* \| \| \|	Merge pull request #8458 from lucisferre/improve-layout-override-fallback-beh...	Rafael Mendonça França	2013-03-27	2	-0/+38
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Provides standard layout lookup behavior for method and proc cases	Chris Nicola	2013-03-27	2	-0/+38
* \| \| \|	Skipping test for OpenSSL::PKCS5 JRuby	Arun Agrawal	2013-03-25	1	-0/+10
* \| \| \|	Update tests for #9704, named route collisions	Jeremy Kemper	2013-03-24	2	-6/+7
* \| \| \|	Introduce UpgradeLegacySignedCookieJar to transparently upgrade existing sign...	Trevor Turk	2013-03-24	1	-0/+55
* \| \| \|	Merge pull request #9704 from trevorturk/warn-about-skipped-routes	Jeremy Kemper	2013-03-24	1	-19/+18
\|\ \ \ \
\| * \| \| \|	Raise an ArgumentError when a clashing named route is defined	Trevor Turk	2013-03-19	1	-19/+18
* \| \| \| \|	Changed 'args' to 'arguments' in test description	Prathamesh Sonpatki	2013-03-24	2	-2/+2
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Merge pull request #9802 from newsline/fix-broken-action-missing	Rafael Mendonça França	2013-03-20	1	-0/+12
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix broken ActionController#action_missing	Janko Luin	2013-03-20	1	-0/+12
* \| \| \|	Fix improperly configured host in generated urls	schneems	2013-03-19	1	-0/+8
\|/ / /
* \| \|	Digest auth should not 500 when given a basic header.	Brad Dunbar	2013-03-18	1	-0/+8
* \| \|	Merge branch 'master-sec'	Aaron Patterson	2013-03-18	1	-0/+15
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	fix protocol checking in sanitization [CVE-2013-1857]	Aaron Patterson	2013-03-15	1	-0/+10
\| * \|	fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]	Charlie Somerville	2013-03-15	1	-0/+5
* \| \|	Merge pull request #9753 from jbarreneche/bug/render-locale-fallbacks	Carlos Antonio da Silva	2013-03-18	1	-0/+9
\|\ \ \