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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \| \| \| \|	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
* \| \| \| \| \|	Merge pull request #22808 from y-yagi/do_not_clear_all_reporters	Kasper Timm Hansen	2016-01-11	1	-1/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	delete only unnecessary reporter	yuuji.yaginuma	2016-01-11	1	-1/+2
* \| \| \| \| \|	Merge pull request #22998 from kamipo/extract_mysql_column_class	Sean Griffin	2016-01-10	4	-85/+97
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Extract `MySQL::TypeMetadata` class to `connection_adapters/mysql/type_metada...	Ryuta Kamizono	2016-01-11	3	-29/+35
\| * \| \| \| \| \|	Extract `MySQL::Column` class to `connection_adapters/mysql/column.rb`	Ryuta Kamizono	2016-01-11	3	-56/+62
* \| \| \| \| \| \|	Merge pull request #20638 from jaimeiniesta/locale-aware-pluralize-helper	Kasper Timm Hansen	2016-01-10	2	-17/+36
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Pass the current locale to Inflector from the pluralize text helper.	Jaime Iniesta	2016-01-10	2	-17/+36
* \| \| \| \| \| \|	Merge pull request #22833 from sivagollapalli/test_runner_with_multiple_lines	Kasper Timm Hansen	2016-01-10	3	-4/+87
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Added multiple line filters support for test runner	Siva Gollapalli	2016-01-10	3	-4/+87
* \| \| \| \| \| \| \|	Merge pull request #21181 from denisenkom/mypatch	Kasper Timm Hansen	2016-01-10	1	-0/+19
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Test basic auth with symbols in login and password	Mikhail Denisenko	2015-10-24	1	-0/+19