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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #25567 from y-yagi/update_description_of_test_order	Vipul A M	2016-06-29	1	-1/+1
\|\
\| *	update description of `test_order` [ci skip]	yuuji.yaginuma	2016-06-29	1	-1/+1
* \|	Merge pull request #25562 from vipulnsward/select-html-options-test	Rafael França	2016-06-28	1	-1/+10
\|\ \
\| * \|	- Added select tag test for verifying passing html options to f.select helper	Vipul A M	2016-06-28	1	-1/+10
\| \|/
* \|	Merge pull request #25364 from kamipo/fix_serialize_for_date_type	Rafael França	2016-06-28	2	-1/+17
\|\ \ \| \|/ \|/\|
\| *	Fix `Type::Date#serialize` to return a date object correctly	Ryuta Kamizono	2016-06-16	2	-1/+17
* \|	Merge pull request #25544 from piotrj/pj-issue-25488	Rafael França	2016-06-28	2	-1/+21
\|\ \
\| * \|	Fix setting route's to in a scope	Piotr Jakubowski	2016-06-28	2	-1/+21
* \| \|	Fix adding implicitly rendered template digests to ETags	Javan Makhmali	2016-06-28	3	-11/+43
\|/ /
* \|	Make client test run individually.	Kasper Timm Hansen	2016-06-28	1	-1/+3
* \|	Add dup leftover from 26710ab.	Kasper Timm Hansen	2016-06-28	1	-1/+1
* \|	Revert "Merge pull request #25131 from javierhonduco/javierhonduco/clone_dept...	Matthew Draper	2016-06-29	1	-3/+0
* \|	Default to frozen string literals in TagHelper.	Kasper Timm Hansen	2016-06-28	1	-5/+7
* \|	Merge pull request #25555 from vipulnsward/boolean-attributes-update	Rafael França	2016-06-28	4	-14/+13
\|\ \
\| * \|	Bring Boolean Attributes list for AV Tags helper upto speed with current spec.	Vipul A M	2016-06-28	4	-14/+13
* \| \|	Merge pull request #25551 from vipulnsward/25543-follow-up	Kasper Timm Hansen	2016-06-28	1	-1/+1
\|\ \ \
\| * \| \|	Expand list of void elements to match spec from https://html.spec.whatwg.org/...	Vipul A M	2016-06-28	1	-1/+1
\| \|/ /
* \| \|	Merge pull request #25554 from vipulnsward/25543-freeze-string	Kasper Timm Hansen	2016-06-28	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Freeze string for default content for tag_strings, which later goes on to cre...	Vipul A M	2016-06-28	1	-1/+1
\|/ /
* \|	Merge pull request #25123 from bf4/remove_problematic_mime_test	Rafael França	2016-06-27	1	-3/+3
\|\ \
\| * \|	Modifies mime-registration test not to interfere with real mime types	Benjamin Fleischer	2016-05-23	1	-3/+3
* \| \|	Merge pull request #25192 from vipulnsward/25185-default-key-length	Aaron Patterson	2016-06-28	3	-9/+7
\|\ \ \
\| * \| \|	We default to using aes-256-cbc as our verification/signing cipher. It can ac...	Vipul A M	2016-06-27	3	-9/+7
\|/ / /
* \| \|	Merge pull request #25545 from derekprior/dp-simple-format-docs	Vipul A M	2016-06-27	1	-4/+5
\|\ \ \
\| * \| \|	Document `simple_format` handling of `\r`	Derek Prior	2016-06-27	1	-4/+5
\|/ / /
* \| \|	Merge pull request #25543 from marekkirejczyk/tag_builder_25195	Kasper Timm Hansen	2016-06-27	6	-63/+364
\|\ \ \
\| * \| \|	New syntax for tag helpers i.e. tag.br instead of tag(br) #25195	Marek	2016-06-27	6	-63/+364
\|/ / /
* \| \|	Clearify CHANGELOG for #23011 [ci skip]	Godfrey Chan	2016-06-27	2	-4/+8
* \| \|	Add #16917 to 5.0.0 release notes	Godfrey Chan	2016-06-27	1	-0/+7
* \| \|	Merge pull request #25536 from alexcameron89/update-transactions	Jon Moss	2016-06-27	1	-4/+4
\|\ \ \
\| * \| \|	[ci skip] Clarify DDL term in ActiveRecord::Transactions	Alex Kitchens	2016-06-27	1	-4/+4
\|/ / /
* \| \|	Fix Action Cable README [ci skip]	Rafael Mendonça França	2016-06-26	1	-5/+14
* \| \|	Merge pull request #25534 from kamipo/remove_conflict_line	Rafael França	2016-06-26	1	-1/+0
\|\ \ \
\| * \| \|	Remove conflict line [ci skip]	Ryuta Kamizono	2016-06-27	1	-1/+0
\|/ / /
* \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2016-06-26	3	-6/+151
\|\ \ \
\| * \| \|	Fix and make example generic in README as well [ci skip]	Vipul A M	2016-06-15	1	-3/+3
\| * \| \|	Make log tags example for ACa more generic and not BC specific [ci skip]	Vipul A M	2016-06-15	1	-3/+4
\| * \| \|	[ci skip] When instance_reader is false, attribute can still be assigned by t...	Prathamesh Sonpatki	2016-06-15	1	-1/+2
\| * \| \|	Action Cable routes are enabled by default now [ci skip]	Prathamesh Sonpatki	2016-06-10	1	-5/+0
\| * \| \|	Expand on AC introduction list [ci skip]	Vipul A M	2016-06-07	1	-0/+2
* \| \| \|	Merge pull request #25533 from infertux/fix_typo	Kasper Timm Hansen	2016-06-26	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fix typo in exception class name	Cédric Félizard	2016-06-26	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #25526 from tricknotes/pathname-as-json	Godfrey Chan	2016-06-26	2	-0/+9
\|\ \ \ \
\| * \| \| \|	Define `Pathname#as_json`	Ryunosuke Sato	2016-06-25	2	-0/+9
* \| \| \| \|	Merge pull request #25530 from y-yagi/update_routes_example	Jon Moss	2016-06-25	1	-5/+0
\|\ \ \ \ \
\| * \| \| \| \|	remove unecessary comments [ci skip]	yuuji.yaginuma	2016-06-26	1	-5/+0
* \| \| \| \| \|	Merge pull request #25524 from kamipo/remove_unnecessary_assert_valid_default	Sean Griffin	2016-06-25	2	-14/+0
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove unnecessary `assert_valid_default`	Ryuta Kamizono	2016-06-25	2	-14/+0
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #25528 from Gaurav2728/test_may_not_using_these_files	Sean Griffin	2016-06-25	1	-3/+0
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	client test have not using Pathname and hashwithindifferent access	Gaurav Sharma	2016-06-26	1	-3/+0
\|/ / / / /