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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \|	Merge pull request #20270 from imtayadeway/tw/association-basics-docs	Claudio B.	2015-05-24	1	-11/+12
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	association basics docs fixes
\| * \| \| \| \|	[ci skip] Fix markdown issue in association basics docs.	Tim Wade	2015-05-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The quoted underscore is being intepreted as markdown, causing the entire phrase to be italicized.
\| * \| \| \| \|	[ci skip] Use spaceship operator to indicate precedence.	Tim Wade	2015-05-22	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	[ci skip] Fix grammar/syntax in AR assocation basics.	Tim Wade	2015-05-22	1	-10/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #20265 from benpickles/gitignore-keeps	Santiago Pastorino	2015-05-24	3	-2/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Omit .keep in .gitignore when generated with --skip-keeps.
\| * \| \| \| \| \|	Omit .keep in .gitignore when generated with --skip-keeps.	Ben Pickles	2015-05-22	3	-2/+12
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #20260 from tgxworld/remove_deprecation_warning	Santiago Pastorino	2015-05-24	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecation warning.
\| * \| \| \| \| \| \|	Remove deprecation warning.	Guo Xiang Tan	2015-05-22	1	-1/+1
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://travis-ci.org/rails/rails/jobs/63594316#L1982
* \| \| \| \| \| \|	Merge pull request #20279 from y-yagi/assert_difference_example	Zachary Scott	2015-05-23	1	-9/+9
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|	use keyword arguments in HTTP request methods of assert_difference example [ci skip]
\| * \| \| \| \| \|	use keyword arguments in HTTP request methods of assert_difference example ↵	yuuji.yaginuma	2015-05-24	1	-9/+9
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge pull request #20278 from dleve123/cleanup-contributing-docs-section	Claudio B.	2015-05-23	1	-4/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup docs for contributing to rails docs
\| * \| \| \| \| \|	Reword sentences in contributing docs for clarity.	Daniel Levenson	2015-05-23	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[skip ci] - removes use "squash" where it doesn't apply to git - "is a help" -> "helps" - "if your comment simply says" -> "... simply reads"
\| * \| \| \| \| \|	Reword a sentence about GH Issues in contributing guide.	Daniel Levenson	2015-05-23	1	-1/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[skip ci] "Everyone's Issues" read pretty weird to me, specifically the use of capitalization. I changed the link text to be "issue list", which seems to better "go with the flow", IMHO.
* \| \| \| \| \|	remove useless ivar	Aaron Patterson	2015-05-23	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I should have deleted this earlier with 42e66fac38b54dd53d062fb5d3376218ed2ffdae
* \| \| \| \| \|	add a branch to eliminate multiple nil checks	Aaron Patterson	2015-05-23	1	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	if we add an else conditional to the `presence` check, we can eliminate the second `\|\|` branch in the caller
* \| \| \| \| \|	Merge pull request #20275 from prathamesh-sonpatki/remove-div-for-from-guides	Arun Agrawal	2015-05-23	1	-2/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Remove div_for from guides [ci skip]
\| * \| \| \| \|	Remove div_for from guides [ci skip]	Prathamesh Sonpatki	2015-05-23	1	-2/+2
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Followup of https://github.com/rails/rails/pull/20244.
* \| \| \| \|	move request id manipulation to the request object	Aaron Patterson	2015-05-22	2	-7/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this way we can keep the knowledge of `env` hash keys in one place.
* \| \| \| \|	Merge pull request #20231 from karanarora/Spelling-fix	Zachary Scott	2015-05-22	8	-9/+9
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Rails documentation standard is american english. [ci skip]
\| * \| \| \|	Spelling/typo/grammatical fixes [ci skip]	karanarora	2015-05-23	8	-9/+9
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	spelling fix [ci skip] example to be consistent [ci skip] grammatical fix typo fixes [ci skip]
* \| \| \|	Merge pull request #20255 from eliotsykes/link-associations-to-exists-guide	Yves Senn	2015-05-22	1	-2/+6
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	Link association.exists?(...) to AR::Base.exists? guide [ci skip]
\| * \| \|	Link association.exists?(...) to API docs [ci skip]	Eliot Sykes	2015-05-22	1	-2/+6
\|/ / /
* \| \|	Merge pull request #20254 from eliotsykes/link-relatively-to-configuring-guide	Yves Senn	2015-05-22	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Make link to configuring guide relative [ci skip]
\| * \| \|	Make link to configuring guide relative [ci skip]	Eliot Sykes	2015-05-22	1	-1/+1
\|/ / /
* \| \|	Merge pull request #20252 from waynn/patch-5	Rafael Mendonça França	2015-05-22	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	"maybe" => "may be"
\| * \| \|	"maybe" => "may be"	Waynn Lue	2015-05-21	1	-1/+1
\|/ / /
* \| \|	Merge pull request #20251 from davydovanton/doc-memory-store	Rafael Mendonça França	2015-05-21	2	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \|	Add nodoc label for protected Cache methods
\| * \| \|	[skip ci] Add nodoc label for protected Cache methods	Anton Davydov	2015-05-22	2	-2/+2
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #20250 from davydovanton/doc-mem-cache-store	Rafael Mendonça França	2015-05-21	1	-1/+8
\|\ \ \ \| \| \| \| \| \| \| \|	Update documentation for MemCacheStore::build_mem_cache [ci skip]
\| * \| \|	[skip ci] Update documentation for MemCacheStore::build_mem_cache	Anton Davydov	2015-05-21	1	-1/+8
\| \|/ /
* \| \|	revises a test to account for case-insensitive file systems	Xavier Noria	2015-05-21	1	-3/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The patched test assumed the file system is case-sensitive, but that is not necessarily the case. In particular, this test did not pass in the recommended setup for the dev box, because the /vagrant shared folder is case-insensitive. After looking at some gems that provide access to file system metadata I have chosen to go with the check you can see in the patch because, albeit it's a bit dirty creating a file, it is super easy to understand and clearly portable. References https://github.com/rails/rails-dev-box/issues/102.
* \| \|	Merge pull request #20247 from davydovanton/doc-array-inquirer	Abdelkader Boudih	2015-05-21	1	-4/+10
\|\ \ \ \| \| \| \| \| \| \| \|	Update documentation for ArrayInquirer#any?
\| * \| \|	[skip ci] Update documentation for ArrayInquirer#any?	Anton Davydov	2015-05-21	1	-4/+10
\| \|/ /
* \| \|	Merge pull request #20244 from y-yagi/remove_div_for_from_guide	Kasper Timm Hansen	2015-05-21	1	-20/+0
\|\ \ \ \| \| \| \| \| \| \| \|	remove reference to `div_for` method from guide [ci skip]
\| * \| \|	remove reference to `div_for` method from guide [ci skip]	yuuji.yaginuma	2015-05-21	1	-20/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`div_for` removed in 01e94ef
* \| \| \|	Merge pull request #20235 from davydovanton/doc-update-date	Yves Senn	2015-05-21	1	-0/+6
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	[skip ci] Update documentation for Date class
\| * \| \|	[skip ci] Update documentation for Date class	Anton Davydov	2015-05-21	1	-0/+6
\|/ / /
* \| \|	Merge pull request #20022 from repinel/remove-mocha1	Arthur Nogueira Neves	2015-05-20	1	-59/+88
\|\ \ \ \| \| \| \| \| \| \| \|	Remove use of mocha in the railties path tests
\| * \| \|	Remove use of mocha in the railties path tests	Roque Pinel	2015-05-18	1	-59/+88
\| \| \| \|
* \| \| \|	Merge pull request #17788 from sivagollapalli/master	Arthur Nogueira Neves	2015-05-20	1	-0/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Issue#17703 Test case for tempfile attribute
\| * \| \| \|	Issue#17703 Test case for tempfile attribute	Siva Gollapalli	2015-04-16	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ To avoid regression I am adding this test case on action pack Changed to assert from assert_equal + Added msg to assertion Modified msg
* \| \| \| \|	Merge pull request #20230 from ronakjangir47/american_style	Rafael Mendonça França	2015-05-20	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Rails documentation standard is american english. [ci skip]
\| * \| \| \| \|	Rails documentation standard is american english. [ci skip]	Ronak Jangir	2015-05-20	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #20228 from karanarora/Spelling-fix	Rafael Mendonça França	2015-05-20	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Rails documentation standard is american english. [ci skip]
\| * \| \| \| \|	Rails documentation standard is american english. [ci skip]	karanarora	2015-05-20	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #20225 from manish-shrivastava/master	Rafael Mendonça França	2015-05-20	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	updated Inline format at activerecord rdoc
\| * \| \| \| \|	updated Inline format at activerecord rdoc	Manish shrivastava	2015-05-20	1	-2/+2
\|/ / / / / \| \| \| \| \| \| \| \| \| \|	For Inline formats, changed ` (single backticks) to <tt> tag at active record rdoc as single backticks (`) don't work with rdoc. for inline format.
* \| \| \| \|	Fix broken link for minitest. [ci skip]	Arun Agrawal	2015-05-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For more details see #20222
* \| \| \| \|	Merge pull request #20222 from Gaurav2728/gaurav-update_ruby_links	Yves Senn	2015-05-20	3	-4/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] updated ruby doc links; for rails next version of ruby will be 2.2x
\| * \| \| \| \|	[ci skip] update ruby doc links; for rails next version ruby 2.2+ will be ↵	Gaurav Sharma	2015-05-20	3	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	supported only