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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #15732 from kuldeepaggarwal/correct-assets-ouput	Rafael Mendonça França	2014-06-23	2	-15/+15
\|\
\| *	[ci skip] correct output for asset_helper methods	Kuldeep Aggarwal	2014-06-16	2	-15/+15
* \|	Merge pull request #15878 from sgrif/sg-null-column	Rafael Mendonça França	2014-06-23	5	-33/+18
\|\ \
\| * \|	Add a deprecation cycle for `NullColumn` from `column_for_attribute`	Sean Griffin	2014-06-23	5	-33/+18
* \| \|	Merge pull request #15880 from davetoxa/patch-1	Zachary Scott	2014-06-23	4	-5/+5
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Small typo	Anton Cherepanov	2014-06-23	4	-5/+5
\|/ /
* \|	Merge pull request #15852 from SyntaxBlitz/master	Rafael Mendonça França	2014-06-23	1	-1/+1
\|\ \
\| * \|	Change double quotes to single quotes in guide	Timothy Aveni	2014-06-21	1	-1/+1
* \| \|	Merge pull request #15867 from sgrif/sg-rm-column-types	Yves Senn	2014-06-23	3	-5/+1
\|\ \ \
\| * \| \|	Remove unneeded `@column_types` instance variable	Sean Griffin	2014-06-22	3	-5/+1
* \| \| \|	changelog entries for #15866 and #15848	Yves Senn	2014-06-22	1	-0/+11
* \| \| \|	Merge pull request #15848 from sgrif/sg-remove-deprecation	Yves Senn	2014-06-22	1	-8/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Remove old deprecation warning	Sean Griffin	2014-06-22	1	-8/+1
* \| \| \|	Merge pull request #15865 from sgrif/sg-missing-test	Yves Senn	2014-06-22	1	-0/+20
\|\ \ \ \
\| * \| \| \|	Add missing test cases for `attribute_names` instance method	Sean Griffin	2014-06-22	1	-0/+20
* \| \| \| \|	Merge pull request #15866 from sgrif/sg-reload-attributes	Yves Senn	2014-06-22	3	-5/+8
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	`reload` should fully reload attributes	Sean Griffin	2014-06-22	3	-5/+8
\|/ / / /
* \| \| \|	Merge pull request #15860 from aidanharan/docrails-assets-manifest-typo	Yves Senn	2014-06-22	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Added missing colon in asset manifest JSON.	Aidan Haran	2014-06-18	1	-1/+1
* \| \| \|	Merge pull request #15859 from zuhao/refactor_activesupport_caching_test	Yves Senn	2014-06-22	1	-14/+13
\|\ \ \ \
\| * \| \| \|	Create with_env helper for tests.	Zuhao Wan	2014-06-22	1	-14/+13
\|/ / / /
* \| \| \|	Merge pull request #15839 from sgrif/sg-attr-set-null	Yves Senn	2014-06-22	6	-12/+17
\|\ \ \ \
\| * \| \| \|	Return a null object from `AttributeSet#[]`	Sean Griffin	2014-06-20	6	-12/+17
* \| \| \| \|	Merge pull request #15849 from sgrif/sg-move-attributes	Yves Senn	2014-06-22	3	-3/+14
\|\ \ \ \ \
\| * \| \| \| \|	Move `attributes` to the `AttributeSet` object.	Sean Griffin	2014-06-21	3	-3/+14
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #15850 from sgrif/sg-missing-tests	Yves Senn	2014-06-22	1	-0/+11
\|\ \ \ \ \
\| * \| \| \| \|	Add missing test cases for `attribute_method?`	Sean Griffin	2014-06-21	1	-0/+11
\| \|/ / / /
* \| \| \| \|	Merge pull request #15856 from zuhao/refactor_activesupport_decoding_test	Yves Senn	2014-06-22	1	-11/+19
\|\ \ \ \ \
\| * \| \| \| \|	Use with_parse_json_times helper in tests.	Zuhao Wan	2014-06-22	1	-11/+19
\| \|/ / / /
* \| \| \| \|	Merge pull request #15857 from zuhao/refactor_activesupport_encoding_test	Yves Senn	2014-06-22	1	-14/+19
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Avoid hardcoded magic number in test teardown.	Zuhao Wan	2014-06-22	1	-14/+19
\|/ / / /
* \| \| \|	:nail_care: wrap the tip from #15624 at 80 chars [ci skip]	Zachary Scott	2014-06-20	1	-1/+2
* \| \| \|	Merge pull request #15624 from aditya-kapoor/add-warnings-on-guides	Zachary Scott	2014-06-20	1	-0/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	[ci skip] Add Tip for change_column_null and change_column_default in guides	Aditya Kapoor	2014-06-21	1	-0/+2
* \| \| \|	Merge pull request #15764 from arthurnn/dependencies_name_error	Matthew Draper	2014-06-21	3	-5/+11
\|\ \ \ \
\| * \| \| \|	Add regression test for NameError#name	Arthur Neves	2014-06-20	2	-2/+5
\| * \| \| \|	Make dependencies.rb add a name to NameError	Arthur Neves	2014-06-20	2	-4/+7
\|/ / / /
* \| \| \|	docs, configurations method is listed in the docs. [ci skip]	Yves Senn	2014-06-20	1	-1/+0
* \| \| \|	Merge pull request #15809 from maurogeorge/guides-console-app	Yves Senn	2014-06-20	1	-0/+25
\|\ \ \ \
\| * \| \| \|	Add to guides app and helper objects on command line	Mauro George	2014-06-19	1	-0/+25
* \| \| \| \|	Merge pull request #15537 from tgxworld/fix_state_leak	Matthew Draper	2014-06-20	4	-5/+5
\|\ \ \ \ \
\| * \| \| \| \|	Remove redundant code.	Guo Xiang Tan	2014-06-05	1	-4/+0
\| * \| \| \| \|	Prevent state leak.	Guo Xiang Tan	2014-06-05	4	-1/+5
* \| \| \| \| \|	Merge pull request #15824 from bhicks/remove-extra-list-item-element	Sean Griffin	2014-06-19	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove extra list item element	Ben Hicks	2014-06-19	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	add both branches to the only_path conditional	Aaron Patterson	2014-06-19	1	-6/+6
* \| \| \| \| \|	Merge pull request #15728 from sgrif/sg-double-save-hm-t	Rafael Mendonça França	2014-06-19	3	-4/+30
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Don't save through records twice	Sean Griffin	2014-06-17	3	-3/+29
* \| \| \| \| \| \|	Merge pull request #15823 from yuki24/better-docmentation-for-dynamic-error-p...	Rafael Mendonça França	2014-06-19	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	ErrorsController shouldn't inherit ApplicationController, but ActionControlle...	Yuki Nishijima	2014-06-19	1	-1/+1