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

	Commit message (Expand)	Author	Age	Files	Lines
*	ar/connection_pool: honor overriden rack.test in middleware	Simon Eskildsen	2014-09-23	3	-1/+14
*	Merge pull request #17018 from prathamesh-sonpatki/tenderlove	Abdelkader Boudih	2014-09-23	1	-1/+5
\|\
\| *	Update changelog with tenderlove's entry	Prathamesh Sonpatki	2014-09-23	1	-1/+5
\|/
*	add a truncate method to the connection	Aaron Patterson	2014-09-22	6	-0/+38
*	Merge pull request #17012 from petedmarsh/clarify-association-primary-key-opt...	Rafael Mendonça França	2014-09-22	1	-1/+1
\|\
\| *	Clarify the documentation of the primary_key option for associations	Peter Marsh	2014-09-22	1	-1/+1
\|/
*	Merge pull request #16963 from collectiveidea/activejob-dj	Rafael Mendonça França	2014-09-22	1	-3/+9
\|\
\| *	Cleaner queuing of jobs using Delayed Job	David Genord II	2014-09-18	1	-3/+9
* \|	Merge pull request #17009 from arthurnn/foreign_key_symbols	Rafael Mendonça França	2014-09-22	3	-3/+3
\|\ \
\| * \|	Better regression test for Fixtures with fk as a symbol	Arthur Neves	2014-09-22	2	-11/+2
\| * \|	fix fixtures not loading if a belongs_to association is defined with a :forei...	Will Bryant	2014-09-22	2	-1/+10
* \| \|	Revert "Merge pull request #16888 from jejacks0n/render_template"	Godfrey Chan	2014-09-23	4	-27/+20
* \| \|	Move the array to a constant	Godfrey Chan	2014-09-23	1	-3/+4
* \| \|	Merge pull request #16851 from prathamesh-sonpatki/mention-validate-in-upgrad...	Godfrey Chan	2014-09-23	1	-1/+6
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Update error message for validate method	Prathamesh Sonpatki	2014-09-20	1	-1/+6
* \| \|	Merge pull request #16985 from matthewd/no-isolated-for-prs	Godfrey Chan	2014-09-23	1	-0/+1
\|\ \ \
\| * \| \|	Skip isolated tests for PRs	Matthew Draper	2014-09-20	1	-0/+1
* \| \| \|	CHANGELOG for 07635a7	Godfrey Chan	2014-09-23	2	-0/+20
* \| \| \|	Merge pull request #16888 from jejacks0n/render_template	Godfrey Chan	2014-09-23	2	-20/+7
\|\ \ \ \
\| * \| \| \|	Changes default render behavior from file to template.	jejacks0n	2014-09-11	2	-20/+7
* \| \| \| \|	Merge pull request #16999 from cristianbica/activejob-adapters-rdoc	Abdelkader Boudih	2014-09-22	14	-71/+194
\|\ \ \ \ \
\| * \| \| \| \|	Added RDoc for each Active Job adapter	Cristian Bica	2014-09-22	14	-71/+194
* \| \| \| \| \|	Merge pull request #16974 from silp-com/mail_was_called	Yves Senn	2014-09-22	5	-2/+30
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Allow attaching files while the mail view is rendered	Christian Felder (masone)	2014-09-22	4	-2/+24
* \| \| \| \| \| \|	Merge pull request #17001 from claudiob/remove-wrapping-div-from-form-helpers...	Yves Senn	2014-09-22	2	-35/+19
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Remove wrapping <div> in form helpers from doc	claudiob	2014-09-22	2	-35/+19
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #17000 from yuki24/fix-false-assertions	Yves Senn	2014-09-22	2	-3/+3
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix another false assertions	Yuki Nishijima	2014-09-21	2	-3/+3
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Wrap it up! :trollface: [ci skip]	Zachary Scott	2014-09-22	1	-3/+2
* \| \| \| \| \| \|	Wrap Adequate Record release notes at 80 chars [ci skip]	Zachary Scott	2014-09-22	1	-6/+14
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #16998 from yuki24/fix-false-assertion	Matthew Draper	2014-09-22	1	-3/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix assertions in AR::TestCase::AttributeMethodsTest	Yuki Nishijima	2014-09-21	1	-3/+3
* \| \| \| \| \| \|	Merge pull request #16984 from chancancode/fix_16578	Godfrey Chan	2014-09-22	2	-5/+16
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Document that the default for `rails server -b` has changed	Godfrey Chan	2014-09-22	2	-5/+16
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #16979 from square/standardize-call-style	Yves Senn	2014-09-21	4	-4/+4
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Standardize on `Rails.application` [ci skip]	Tamir Duberstein	2014-09-19	5	-7/+7
* \| \| \| \| \| \|	Merge pull request #16994 from yuki24/fix-typo-in-ar-attribute-method-test	Zachary Scott	2014-09-21	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix typo [ci skip]	Yuki Nishijima	2014-09-20	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #16988 from y-yagi/chg_default_log_level	Zachary Scott	2014-09-21	2	-2/+2
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	[ci skip] modify the description of production log level default	yuuji.yaginuma	2014-09-21	2	-2/+2
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #16987 from jonatack/patch-8	Yves Senn	2014-09-20	1	-13/+15
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	ActiveRecord CHANGELOG improvements [skip ci]	Jon Atack	2014-09-20	1	-13/+15
\|/ / / / / /
* \| \| \| \| \|	No need to call to_sym here	Godfrey Chan	2014-09-20	3	-10/+10
* \| \| \| \| \|	Fix find_by with associations not working with adequate record	Godfrey Chan	2014-09-20	2	-0/+8
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	Quick fix to address the borken build caused by #15791	Godfrey Chan	2014-09-20	1	-1/+1
* \| \| \| \|	Merge pull request #15791 from zev/add_model_to_recordnotfound_message	Aaron Patterson	2014-09-19	2	-18/+26
\|\ \ \ \ \
\| * \| \| \| \|	Update RecordNotFound exception cases to include a message with the	Zev Blut	2014-06-18	2	-18/+26
* \| \| \| \| \|	Merge pull request #16981 from gsamokovarov/concern-docs-comment-reword	Rafael Mendonça França	2014-09-19	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	[ci skip] Reword a comment in concern's documentation	Genadi Samokovarov	2014-09-19	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #16973 from prathamesh-sonpatki/fixtures-features	Rafael Mendonça França	2014-09-19	1	-0/+3
\|\ \ \ \ \