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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #23014 from jonatack/improve-generated-config-files	Rafael França	2016-01-15	2	-4/+6
\|\
\| *	Improve generated config initializer files	Jon Atack	2016-01-13	2	-4/+6
* \|	Merge pull request #23052 from kamipo/update_deprecation_horizon	Rafael França	2016-01-15	1	-3/+3
\|\ \
\| * \|	Update deprecation_horizon to 5.1 from 5.0 [ci skip]	Ryuta Kamizono	2016-01-14	1	-3/+3
* \| \|	Merge pull request #23059 from rails/revert-23017-schneems/migration-sets-env...	Sean Griffin	2016-01-14	2	-58/+19
\|\ \ \
\| * \| \|	Revert "Set environment even when no migration runs"	Sean Griffin	2016-01-14	2	-58/+19
\|/ / /
* \| \|	Revert "Merge pull request #20835 from glittershark/if-and-unless-in-secure-t...	Kasper Timm Hansen	2016-01-14	5	-45/+2
* \| \|	Merge pull request #23048 from kamipo/substitute_at_is_no_longer_used	Sean Griffin	2016-01-14	6	-20/+3
\|\ \ \
\| * \| \|	`substitute_at` is no longer used	Ryuta Kamizono	2016-01-14	6	-20/+3
* \| \| \|	Properly include the `from` clause when merging relations	Sean Griffin	2016-01-14	2	-0/+10
* \| \| \|	Ensure enum scopes work properly with STI and inheritance	Sean Griffin	2016-01-14	1	-1/+1
* \| \| \|	Merge pull request #23017 from schneems/schneems/migration-sets-environment-v...	Richard Schneeman	2016-01-14	2	-19/+58
\|\ \ \ \
\| * \| \| \|	Set environment even when no migration runs	schneems	2016-01-11	2	-1/+37
\| * \| \| \|	Clean up duplicate migration logic	schneems	2016-01-11	2	-18/+21
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #23054 from ankit1910/update-doc	Jon Moss	2016-01-14	1	-0/+1
\|\ \ \ \
\| * \| \| \|	update doc for << method of has_many association	ankit1910	2016-01-14	1	-0/+1
* \| \| \| \|	Merge pull request #23056 from ankit1910/fix-typo	Rafael França	2016-01-14	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	[ci skip] fix typo in docs	ankit1910	2016-01-14	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #23049 from sevenseacat/patch-1	Jon Moss	2016-01-13	1	-2/+2
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Fix typo in docs [ci skip]	Rebecca Skinner	2016-01-14	1	-2/+2
\|/ / /
* \| /	Space Oddity	Akira Matsuda	2016-01-14	3	-4/+4
\| \|/ \|/\|
* \|	docs, formatting pass over changelogs. [ci skip]	Yves Senn	2016-01-13	4	-11/+13
* \|	fix regression when loading fixture files with symbol keys.	Yves Senn	2016-01-13	4	-2/+16
* \|	Merge pull request #23040 from rafaelfranca/or-error-message	Matthew Draper	2016-01-13	2	-7/+11
\|\ \
\| * \|	Improve error message for #or when it is structurally incompatible	Rafael Mendonça França	2016-01-13	2	-7/+11
\|/ /
* \|	do not run in parallel on travis	Aaron Patterson	2016-01-12	1	-1/+5
* \|	Revert "Change `WhereClause#merge` to same named columns on diff tables"	Sean Griffin	2016-01-12	2	-25/+13
* \|	remove `present?` calls	Aaron Patterson	2016-01-12	1	-4/+4
* \|	monkey patch `recycle!` on to controllers once	Aaron Patterson	2016-01-12	1	-4/+4
* \|	Merge pull request #22935 from cllns/add-status-name-to-output	Rafael França	2016-01-12	5	-17/+84
\|\ \
\| * \|	Add both HTTP Response Code and Type to assertion messages	Sean Collins	2016-01-12	5	-17/+84
* \| \|	Merge pull request #23035 from jkowens/fix-null-byte	Rafael França	2016-01-12	2	-1/+9
\|\ \ \
\| * \| \|	Prevent attempt to serve a request with a null byte	Jordan Owens	2016-01-12	2	-1/+9
* \| \| \|	Change `WhereClause#merge` to same named columns on diff tables	Sean Griffin	2016-01-12	2	-13/+25
* \| \| \|	Merge pull request #23034 from claudiob/fix-ac-param-as-json	Rafael França	2016-01-12	2	-1/+8
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	AC::Parameters#at_json: restore Rails 4.2’s value	claudiob	2016-01-12	2	-1/+8
* \| \| \|	bring back `TEST` env for `rake test`.	Yves Senn	2016-01-12	3	-1/+21
\|/ / /
* \| \|	add migration versioning example to the changelog. [ci skip]	Yves Senn	2016-01-12	1	-0/+8
* \| \|	Merge pull request #23004 from matthewd/default-scope-sti	Matthew Draper	2016-01-12	7	-19/+61
\|\ \ \
\| * \| \|	Skip the STI condition when evaluating a default scope	Matthew Draper	2016-01-12	4	-3/+24
\| * \| \|	Active scopes apply to child classes, though not parents/siblings	Matthew Draper	2016-01-12	3	-16/+37
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #23020 from matthewd/frozen-headers	Matthew Draper	2016-01-12	3	-1/+29
\|\ \ \
\| * \| \|	Commit before freezing the headers	Matthew Draper	2016-01-12	3	-1/+29
\|/ / /
* \| \|	Merge pull request #20762 from maurogeorge/record-not-found-doc	Jon Moss	2016-01-11	1	-2/+6
\|\ \ \
\| * \| \|	Add a note on ActionController guide about 404	Mauro George	2016-01-11	1	-2/+6
* \| \| \|	Unneeded &block parameters	Akira Matsuda	2016-01-12	1	-2/+2
\|/ / /
* \| \|	Merge pull request #23015 from schneems/schneems/manual-environment-set	Richard Schneeman	2016-01-11	2	-6/+17
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Allow manually setting environment value	schneems	2016-01-11	2	-6/+17
\|/ /
* \|	Merge pull request #23003 from y-yagi/remove_warnings	Kasper Timm Hansen	2016-01-11	1	-2/+2
\|\ \
\| * \|	remove warnings from rake test	yuuji.yaginuma	2016-01-11	1	-2/+2