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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #17780 from arcz/patch-1	José Valim	2014-11-26	1	-1/+0
\|\
\| *	Remove extra empty line	Artur Cygan	2014-11-26	1	-1/+0
\|/
*	:scissors:	Rafael Mendonça França	2014-11-26	1	-1/+1
*	Merge pull request #17779 from dilpreet92/server_location	Rafael Mendonça França	2014-11-26	1	-2/+2
\|\
\| *	getting the location of the server	dilpreet92	2014-11-26	1	-2/+2
\|/
*	Clarify where result goes, and supported formats of generate task.	Zachary Scott	2014-11-25	1	-1/+3
*	Use jquery-rails 4.0.0	Rafael Mendonça França	2014-11-25	2	-9/+3
*	Merge pull request #17773 from gsamokovarov/mention-web-console-2.0-rc1	Sean Griffin	2014-11-25	2	-2/+2
\|\
\| *	Use web_console 2.0 for 4.2.0.rc1 release	Genadi Samokovarov	2014-11-26	2	-2/+2
* \|	Merge pull request #17728 from jcutrell/jcutrell/docs-to_session_value-for-pr	Rafael Mendonça França	2014-11-25	1	-3/+6
\|\ \
\| * \|	adding nodoc to private methods	Jonathan Cutrell	2014-11-23	1	-2/+2
\| * \|	Adding simple docs for ActionDispatch::Flash::FlashHash#to_session_value	Jonathan Cutrell	2014-11-23	1	-1/+4
* \| \|	Fix warning in AV tests	Sean Griffin	2014-11-25	1	-2/+4
* \| \|	Merge branch 'derekprior-dp-add-foreign-keys-with-generators'	Rafael Mendonça França	2014-11-25	5	-1/+60
\|\ \ \
\| * \| \|	Generators add foreign keys on references	Derek Prior	2014-11-25	5	-1/+60
\|/ / /
* \| \|	Fix syntax error :bomb:	Rafael Mendonça França	2014-11-25	1	-2/+2
* \| \|	Merge pull request #17697 from sgrif/sg-remove-is-a-check-when-ignoring-tables	Sean Griffin	2014-11-25	2	-16/+1
\|\ \ \
\| * \| \|	Remove is_a? check when ignoring tables	Sean Griffin	2014-11-20	2	-16/+1
* \| \| \|	Merge pull request #17771 from agis-/issue-17373	Sean Griffin	2014-11-25	2	-2/+9
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Local vars should exist in partials for falsy `:object:` values too	Agis-	2014-11-25	2	-2/+9
* \| \| \|	Merge pull request #17733 from yuki24/do-not-rescue-exception-in-params-parser	Rafael Mendonça França	2014-11-25	2	-1/+11
\|\ \ \ \
\| * \| \| \|	Do not rescue Exception in ParamsParser	Yuki Nishijima	2014-11-23	2	-1/+11
* \| \| \| \|	Use released arel	Rafael Mendonça França	2014-11-25	2	-2/+1
* \| \| \| \|	Use released rails-dom-testing	Rafael Mendonça França	2014-11-25	5	-6/+3
* \| \| \| \|	Merge pull request #17768 from bruno-/router-visualizer-css-fix	Rafael Mendonça França	2014-11-25	1	-4/+0
\|\ \ \ \ \
\| * \| \| \| \|	CSS fix for the router visualizer	Bruno Sutic	2014-11-25	1	-4/+0
* \| \| \| \| \|	Move PG float quoting to the correct location	Sean Griffin	2014-11-25	1	-16/+6
\| \|_\|/ / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #17769 from gsamokovarov/remove-slash-console-references	Rafael Mendonça França	2014-11-25	2	-14/+4
\|\ \ \ \ \
\| * \| \| \| \|	Remove Web Console /console references in the guides	Genadi Samokovarov	2014-11-25	2	-14/+4
\|/ / / / /
* \| \| \| \|	Merge pull request #17739 from rails/bring_back_db_test_prepare	Yves Senn	2014-11-25	6	-17/+120
\|\ \ \ \ \
\| * \| \| \| \|	bring back `db:test:prepare`.	Yves Senn	2014-11-25	5	-15/+120
\| * \| \| \| \|	do not trigger AR lazy load hook before initializers ran.	Yves Senn	2014-11-25	1	-2/+0
* \| \| \| \| \|	Setting an association replaces records with the same id in memory	Sean Griffin	2014-11-25	2	-2/+82
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #17767 from javiervidal/fixing_documentation	Rafael Mendonça França	2014-11-25	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Fixing wrong link in 'Ruby on Rails 3.0 Release Notes' [ci skip]	Javier Vidal	2014-11-25	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #17754 from eileencodes/refactor-aliased_table_for	Santiago Pastorino	2014-11-25	2	-13/+4
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Combine aliased_table_for and aliased_name_for	eileencodes	2014-11-24	2	-13/+4
* \| \| \| \|	Merge pull request #17753 from gsamokovarov/dont-center-routing-table	Santiago Pastorino	2014-11-25	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Don't center the routes table on routing errors	Genadi Samokovarov	2014-11-24	1	-1/+1
* \| \| \| \| \|	tests, run `test_test.rb` with `RAILS_ENV=test`.	Yves Senn	2014-11-25	1	-1/+1
* \| \| \| \| \|	Rearrange release notes by importance [ci skip]	Godfrey Chan	2014-11-25	1	-99/+85
* \| \| \| \| \|	:scissors: WIP labels [ci skip]	Godfrey Chan	2014-11-25	2	-6/+0
* \| \| \| \| \|	Prepare for RC: un-wip release notes [ci skip]	Godfrey Chan	2014-11-25	1	-1/+0
* \| \| \| \| \|	We shouldn't be linking to edgeapi [ci skip]	Godfrey Chan	2014-11-25	1	-1/+1
* \| \| \| \| \|	Prepare for RC: link to the 4-2-stable [ci skip]	Godfrey Chan	2014-11-25	2	-3/+3
* \| \| \| \| \|	Cross link to upgrade guide [ci skip]	Godfrey Chan	2014-11-25	1	-1/+2
* \| \| \| \| \|	Merge branch 'nil_script_name'	Santiago Pastorino	2014-11-25	2	-1/+8
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add regression test case to ensure script_name as nil is not used anymore in ...	Santiago Pastorino	2014-11-25	1	-0/+7
\| * \| \| \| \| \|	sets script_name to always be a string.	JONBRWN	2014-11-25	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Final sync with CHANGELOGs [ci skip]	Godfrey Chan	2014-11-25	1	-2/+7