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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' of github.com:rails/rails [ci skip]	Zachary Scott	2014-12-30	1	-3/+4
\|\
\| *	Merge pull request #18261 from prathamesh-sonpatki/update-changelog	Rafael Mendonça França	2014-12-30	1	-3/+4
\| \|\
\| \| *	Update CHANGELOG entry for #18070 [ci skip]	Prathamesh Sonpatki	2014-12-31	1	-3/+4
\| \|/
* /	Make "Testing Views" separate section, move "Setup and Teardown" into	Zachary Scott	2014-12-30	1	-88/+85
\|/
*	Merge pull request #18259 from arthurnn/return_nil_on_multi_pk	Sean Griffin	2014-12-30	6	-8/+33
\|\
\| *	Ensures that primary_key method will return nil when multi-pk	Arthur Neves	2014-12-30	6	-8/+33
* \|	Add implement integration test to Testing Guide. [ci skip]	Zachary Scott	2014-12-30	1	-0/+75
* \|	Replace exhaustive list of helper methods with pointers to helper classes found	Zachary Scott	2014-12-30	1	-16/+7
* \|	Remove this line which was added by accident [ci skip]	Zachary Scott	2014-12-30	1	-2/+0
* \|	Merge pull request #18256 from rohit/secure-password-tweak	Rafael Mendonça França	2014-12-30	1	-1/+1
\|\ \
\| * \|	Use more semantic method to check password	Rohit Arondekar	2014-12-30	1	-1/+1
* \| \|	Merge pull request #18258 from prathamesh-sonpatki/fix-application-name-descr...	Rafael Mendonça França	2014-12-30	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Fix description for application_name method - change simple to simply	Prathamesh Sonpatki	2014-12-30	1	-1/+1
* \| \|	Tiny documentation fixes [ci skip]	Robin Dupret	2014-12-30	2	-4/+5
* \| \|	Merge pull request #18130 from claudiob/better-record-identifier-doc	Robin Dupret	2014-12-30	1	-18/+42
\|\ \ \
\| * \| \|	Better docs for AV::RecordIdentifier	claudiob	2014-12-23	1	-18/+42
* \| \| \|	Merge pull request #18255 from prathamesh-sonpatki/fix-single-space-for-head	Rafael Mendonça França	2014-12-30	3	-5/+17
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Remove single space response body for head request	Prathamesh Sonpatki	2014-12-30	3	-5/+17
\|/ / /
* \| \|	Merge pull request #18251 from tjgrathwell/fix-polymorphic-routes-to-model	Rafael Mendonça França	2014-12-30	3	-10/+25
\|\ \ \
\| * \| \|	Fix form_for to work with objects that implement to_model	Travis Grathwell	2014-12-29	2	-10/+21
* \| \| \|	AR specific length validator to respect `marked_for_destruction`.	Yves Senn	2014-12-30	5	-0/+49
\| \|_\|/ \|/\| \|
* \| \|	Template lookup now respect default locale and I18n fallbacks.	Rafael Mendonça França	2014-12-29	6	-11/+52
* \| \|	Move Rake tasks list to a smaller heading section earlier in the guide.	Zachary Scott	2014-12-29	1	-21/+21
* \| \|	Condense notes regarding Minitest and its available assertions removed in:	Zachary Scott	2014-12-29	1	-38/+19
* \| \|	Remove redundant information about Minitest, which is already covered when	Zachary Scott	2014-12-29	1	-8/+0
\|/ /
* \|	Move longer form example from integration guide to api reference, below an	Zachary Scott	2014-12-29	2	-74/+78
* \|	Grammar pass through Integration Testing section [ci skip]	Zachary Scott	2014-12-29	1	-3/+3
* \|	fix error message of option as with invalid charters in partial rendering	Angelo capilleri	2014-12-29	3	-5/+32
* \|	Merge branch 'master' of github.com:rails/rails [ci skip]	Zachary Scott	2014-12-29	1	-0/+8
\|\ \
\| * \	Merge pull request #18249 from claudiob/add-doc-for-save-with-touch	Rafael Mendonça França	2014-12-29	1	-0/+8
\| \|\ \
\| \| * \|	Add doc for `:touch` option of AR::Base#save	claudiob	2014-12-30	1	-0/+8
* \| \| \|	Remove pre-4.2 comment about missing `assert_select` [ci skip]	Zachary Scott	2014-12-29	1	-2/+0
* \| \| \|	Update link to rails-dom-testing documentation [ci skip]	Zachary Scott	2014-12-29	1	-1/+1
* \| \| \|	Pass through `assert_select` testing guide [ci skip]	Zachary Scott	2014-12-29	1	-4/+9
\|/ / /
* \| \|	Implement testing `flash` notices into our blog app [ci skip]	Zachary Scott	2014-12-29	1	-3/+62
* \| \|	Pass through Testing Templates and Layouts section [ci skip]	Zachary Scott	2014-12-29	1	-11/+13
* \| \|	These are technically objects [ci skip]	Zachary Scott	2014-12-29	1	-2/+2
* \| \|	Rephrase Four Hashes of the Apocalypse [ci skip]	Zachary Scott	2014-12-29	1	-1/+1
\|/ /
* \|	Compare http request type with test equivalent methods, and application use-c...	Zachary Scott	2014-12-29	1	-2/+2
* \|	Merge pull request #18246 from aprescott/document-include_all_helpers-setting	Rafael Mendonça França	2014-12-29	1	-0/+2
\|\ \
\| * \|	Document the include_all_helpers config setting.	Adam Prescott	2014-12-29	1	-0/+2
* \| \|	Merge pull request #18244 from cristianbica/remove-object-itself	Rafael Mendonça França	2014-12-29	3	-25/+0
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Removed Object#itself as it's implemented in ruby 2.2	Cristian Bica	2014-12-29	3	-25/+0
* \| \|	Rephrase functional testing in its relation to Rails Controller Unit Testing.	Zachary Scott	2014-12-29	1	-1/+1
\|/ /
* \|	Merge pull request #18243 from JoshCheek/mailer_guide_code_example	Carlos Antonio da Silva	2014-12-29	1	-1/+3
\|\ \
\| * \|	Un-inline if statement	Josh Cheek	2014-12-29	1	-1/+3
\|/ /
* \|	Merge pull request #18240 from shunsukeaida/add_tzinfo_data_to_plugin_gemfile	Rafael Mendonça França	2014-12-29	1	-0/+4
\|\ \
\| * \|	plugin's gemfile also needs tzinfo-data in Windows	ShunsukeAida	2014-12-30	1	-0/+4
* \| \|	Remove some warning with Ruby 2.2	Rafael Mendonça França	2014-12-29	1	-1/+1
* \| \|	Ensure `first!` and friends work on loaded associations	Sean Griffin	2014-12-29	3	-0/+12