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

	Commit message (Expand)	Author	Age	Files	Lines
*	Revert "Merge pull request #19844 from stevenspiel/link_to_if_block_helper_ad...	Yves Senn	2015-05-01	3	-10/+1
*	Merge pull request #19844 from stevenspiel/link_to_if_block_helper_addition	Yves Senn	2015-05-01	3	-1/+10
\|\
\| *	Update url_helper.rb	Steven Spiel	2015-04-21	1	-1/+1
* \|	Merge pull request #19969 from y-yagi/fix_job_helper_method	Yves Senn	2015-05-01	3	-2/+30
\|\ \
\| * \|	match a expected value with message of `assert_equal` in AJ helper methods	yuuji.yaginuma	2015-05-01	1	-2/+2
\|/ /
* \|	Merge pull request #19962 from prathamesh-sonpatki/nodoc-validate-index-length	Yves Senn	2015-04-30	1	-1/+1
\|\ \
\| * \|	Nodoc validate_index_length! method	Prathamesh Sonpatki	2015-04-30	1	-1/+1
* \| \|	Merge pull request #19961 from prathamesh-sonpatki/pg-docs	Richard Schneeman	2015-04-30	2	-2/+5
\|\ \ \
\| * \| \|	Added documentation for PostGreSQL database_statements [ci skip]	Prathamesh Sonpatki	2015-04-30	2	-2/+5
\| \|/ /
* \| \|	Merge pull request #19959 from imtayadeway/tw/caching-docs	Zachary Scott	2015-04-29	1	-11/+11
\|\ \ \
\| * \| \|	Fix style/grammar/typos in Caching guide.	Tim Wade	2015-04-29	1	-11/+11
\|/ / /
* \| \|	Add doc for original_exception in ActiveJob::DeserializationError [ci skip]	Zachary Scott	2015-04-29	1	-0/+2
* \| \|	Add initial doc for Core in AJ [ci skip]	Zachary Scott	2015-04-29	1	-0/+2
* \| \|	Add initial doc for Enqueuing module [ci skip]	Zachary Scott	2015-04-29	1	-0/+1
* \| \|	Rails should be nodoc'd here [ci skip]	Zachary Scott	2015-04-29	1	-1/+1
* \| \|	Merge pull request #19957 from rywall/patch-2	Zachary Scott	2015-04-29	1	-0/+3
\|\ \ \
\| * \| \|	Document :tld_length option for cookies.	Ryan Wallace	2015-04-29	1	-0/+3
* \| \| \|	Merge pull request #19952 from vngrs/activejob_missing_error_messages	Yves Senn	2015-04-29	4	-4/+4
\|\ \ \ \
\| * \| \| \|	Add missing error messages for sucker_punch, sneakers and qu activejob adapte...	Mehmet Emin İNAÇ	2015-04-29	4	-4/+4
* \| \| \| \|	Merge pull request #19949 from thiagoaugusto/create-thiago-punctuation-fix	Yves Senn	2015-04-29	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	CHANGELOG punctuation fix	Thiago Augusto	2015-04-29	1	-1/+1
\| \| \|/ / / \| \|/\| \| \|
* / \| \| \|	Revert "Merge pull request #19817 from tpitale/4_2-release-notes-fix"	Godfrey Chan	2015-04-28	1	-2/+3
\|/ / / /
* \| \| \|	Merge pull request #19945 from thenickcox/migration_generator_docs	Zachary Scott	2015-04-28	1	-4/+5
\|\ \ \ \
\| * \| \| \|	[ci skip] Correct grammar, add docs to ActiveRecord migration generator	Nick Cox	2015-04-28	1	-4/+5
* \| \| \| \|	Merge pull request #19941 from javan/actionmailer-cache-noop	Rafael Mendonça França	2015-04-28	2	-2/+14
\|\ \ \ \ \
\| * \| \| \| \|	Make ActionMailer #cache helper a no-op, not an exception	Javan Makhmali	2015-04-28	2	-2/+14
\|/ / / / /
* \| \| \| \|	Merge pull request #19939 from artofhuman/remove-mocha-from-some-tests	Rafael Mendonça França	2015-04-28	1	-10/+13
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Remove use of mocha in the named base tests	Semyon Pupkov	2015-04-28	1	-10/+13
* \| \| \| \|	Merge pull request #19942 from earthrid/master	Zachary Scott	2015-04-28	1	-4/+1
\|\ \ \ \ \
\| * \| \| \| \|	Rewording	Kevin Busby	2015-04-28	1	-4/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #19917 from senny/preview_null_mail	Yves Senn	2015-04-28	5	-6/+55
\|\ \ \ \ \
\| * \| \| \| \|	mailer previews for `NullMail` instances. Closes #19849.	Yves Senn	2015-04-28	5	-6/+47
\| * \| \| \| \|	mailer previews, make sure labels and values line up.	Yves Senn	2015-04-28	2	-0/+8
\|/ / / / /
* \| \| \| \|	Merge pull request #19932 from axilleas/api_docs_guidelines	Yves Senn	2015-04-28	2	-2/+7
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Update instructions to build guides locally [ci skip]	Achilleas Pipinellis	2015-04-28	2	-2/+7
* \| \| \| \|	Merge pull request #19935 from eliotsykes/clarify-configuring-default-test-order	Carlos Antonio da Silva	2015-04-28	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Clarify test_order default configuration behaviour [ci skip]	Eliot Sykes	2015-04-28	1	-1/+1
* \| \| \| \| \|	Merge pull request #19937 from tak1n/master	Carlos Antonio da Silva	2015-04-28	1	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	fixed typo	Benny Klotz	2015-04-28	1	-2/+2
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #19931 from prathamesh-sonpatki/note-about-non-get-links	Yves Senn	2015-04-28	1	-0/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Added note about non-GET links getting converted to GET links in mailer temp...	Prathamesh Sonpatki	2015-04-28	1	-0/+3
* \| \| \| \| \| \|	Merge pull request #19930 from axilleas/doc_smtp_plain_auth_fix	Yves Senn	2015-04-28	1	-2/+2
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	AUTH PLAIN is Base64 encoded [ci skip]	Achilleas Pipinellis	2015-04-28	1	-2/+2
\| \|/ / / / /
* \| / / / /	guides, bring back minitest assertion table. [ci skip]	Yves Senn	2015-04-28	1	-3/+43
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #19907 from artofhuman/sneakers-update	Yves Senn	2015-04-28	2	-8/+8
\|\ \ \ \ \
\| * \| \| \| \|	Unlock sneakers adapter version	Semyon Pupkov	2015-04-28	2	-8/+8
* \| \| \| \| \|	Merge pull request #19546 from DianthuDia/fix_unscope_for_less_than	Yves Senn	2015-04-28	3	-1/+17
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	Fix unscope for less than	TAKAHASHI Kazuaki	2015-03-27	2	-1/+13
* \| \| \| \| \|	Merge pull request #19718 from eagletmt/find_by-without-arg	Yves Senn	2015-04-28	3	-4/+17
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	Raise ArgumentError when find_by receives no arguments	Kohei Suzuki	2015-04-11	2	-4/+12