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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #18271 from arunagw/change-copyright-year	Robin Dupret	2015-01-01	16	-16/+16
\|\
\| *	Update copyright notices to 2015 [ci skip]	Arun Agrawal	2014-12-31	16	-16/+16
* \|	Merge pull request #18275 from robin850/head-status	Carlos Antonio da Silva	2014-12-31	4	-5/+23
\|\ \
\| * \|	Correctly use the response's status code calling head	Robin Dupret	2014-12-31	4	-5/+23
* \| \|	Changelog edits [ci skip]	Robin Dupret	2014-12-31	3	-20/+26
* \| \|	Tiny follow-up to #18260 [ci skip]	Robin Dupret	2014-12-31	2	-11/+12
* \| \|	Merge pull request #18277 from prathamesh-sonpatki/typo-aj-changelog	Arun Agrawal	2014-12-31	1	-1/+1
\|\ \ \
\| * \| \|	Fixed typo in ActiveJob CHANGELOG [ci skip]	Prathamesh Sonpatki	2014-12-31	1	-1/+1
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #18272 from kamipo/fix_warning_assigned_but_unused_variable	Sean Griffin	2014-12-31	1	-1/+1
\|\ \ \
\| * \| \|	Fix warning: assigned but unused variable - post	Ryuta Kamizono	2014-12-31	1	-1/+1
\| \|/ /
* \| \|	Merge pull request #18276 from y-yagi/fix_rake_command	Robin Dupret	2014-12-31	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	fix rake command typo in Testing guide [ci skip]	yuuji.yaginuma	2014-12-31	1	-1/+1
\|/ /
* \|	Merge pull request #18274 from rajcybage/spell_fix	Robin Dupret	2014-12-31	2	-4/+4
\|\ \
\| * \|	Fix spell life cycle on activejob docs [ ci skip]	Rajarshi Das	2014-12-31	2	-4/+4
* \| \|	Merge pull request #18269 from cuppincake/getting-started-migration-update	Yves Senn	2014-12-31	1	-0/+3
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Update Getting Started guide to reflect foreign key in migration [ci skip]	Jennifer Wollesen	2014-12-30	1	-0/+3
* \| \|	Merge pull request #18270 from prathamesh-sonpatki/activejobs-is-not-actionjob	Cristian Bica	2014-12-31	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	ActiveJob is not ActionJob [ci skip] :smile:	Prathamesh Sonpatki	2014-12-31	1	-1/+1
\|/ /
* \|	Add Profiling guide skeleton [ci skip]	Zachary Scott	2014-12-30	2	-0/+22
* \|	Extract the index length validation to a auxiliar method	Rafael Mendonça França	2014-12-30	3	-9/+12
* \|	Merge pull request #18264 from yahonda/rename_index_mysql	Rafael Mendonça França	2014-12-30	1	-0/+3
\|\ \
\| * \|	Raise a better exception for renaming long indexes for mysql adapters	Yasuo Honda	2014-12-30	1	-0/+3
* \| \|	Merge pull request #18266 from cristianbica/ajfixes	Rafael Mendonça França	2014-12-30	6	-12/+21
\|\ \ \
\| * \| \|	ActiveJob testing improvements	Cristian Bica	2014-12-30	6	-12/+21
* \| \| \|	Fix error message when trying to create an associated record	Rafael Mendonça França	2014-12-30	4	-1/+23
* \| \| \|	Merge pull request #18260 from isaacseymour/active-job-delegate-deserialize	David Heinemeier Hansson	2014-12-30	2	-4/+53
\|\ \ \ \
\| * \| \| \|	ActiveJob: delegate full deserialization to class	Isaac Seymour	2014-12-30	2	-4/+53
* \| \| \| \|	stop referencing `env` in url_for	Aaron Patterson	2014-12-30	2	-1/+5
* \| \| \| \|	use methods on the request rather than direct hash access	Aaron Patterson	2014-12-30	2	-2/+10
* \| \| \| \|	Merge pull request #18242 from brainopia/has_one_loading_for_new_record	Sean Griffin	2014-12-30	6	-43/+71
\|\ \ \ \ \
\| * \| \| \| \|	Share foreign_key_present? implementation in _has_ associations	brainopia	2014-12-31	6	-43/+71
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #18219 from jaroslawr/master	Aaron Patterson	2014-12-30	1	-74/+116
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Flatten the call stacks ActiveSupport::Callbacks produces, fix #18011.	Jaroslaw Rzeszotko	2014-12-27	1	-74/+116
* \| \| \| \|	Merge pull request #17680 from larskanis/fix_bytea_change_detection	Sean Griffin	2014-12-30	2	-1/+9
\|\ \ \ \ \
\| * \| \| \| \|	PostgreSQL, Fix change detection caused by wrong data for bytea unescaping.	Lars Kanis	2014-12-29	2	-1/+9
* \| \| \| \| \|	Move Engines guide under Extending Rails [ci skip]	Zachary Scott	2014-12-30	1	-5/+5
* \| \| \| \| \|	Merge pull request #18262 from benwoody/fix-cycle-doc-missprint	Zachary Scott	2014-12-30	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fixes simple missprint in docs for #cyle in text_helper	Ben Woodall	2014-12-30	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #18263 from mntj/fix_typo_in_comment	Zachary Scott	2014-12-30	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Fix comment typo in debugger.rb	mntj	2014-12-30	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	The Guide to Testing Rails Applications is published! :tada: :tada: [ci skip]	Zachary Scott	2014-12-30	2	-5/+9
* \| \| \| \| \|	Replace exhaustive list of methods with pointer to API docs. [ci skip]	Zachary Scott	2014-12-30	1	-11/+1
* \| \| \| \| \|	Add result of running articles_routes_test and point to more information for	Zachary Scott	2014-12-30	1	-0/+16
* \| \| \| \| \|	Move request tests after functional and before views, and move helper tests	Zachary Scott	2014-12-30	1	-50/+50
* \| \| \| \| \|	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