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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #9329 from chuckbjones/fix-cache-delete-rc	Steve Klabnik	2013-02-26	3	-2/+16
\|\
\| *	Fix deletion of empty directories:	Charles Jones	2013-02-25	3	-2/+16
* \|	We want i18n >= 0.6.2 but < 1.0	Santiago Pastorino	2013-02-26	1	-1/+1
* \|	Merge pull request #9446 from bemurphy/enhance_root_route_guide	Carlos Antonio da Silva	2013-02-26	1	-0/+10
\|\ \
\| * \|	Add routing guide doc on root with namespaces.	Brendon Murphy	2013-02-26	1	-0/+10
* \| \|	Merge pull request #9443 from exviva/belongs_to_touch_new_record	Rafael Mendonça França	2013-02-26	3	-2/+19
\|\ \ \
\| * \| \|	Fix touching an invalid parent record for belongs_to	Olek Janiszewski	2013-02-26	3	-2/+19
\|/ / /
* \| \|	Move the CHANGELOG entry to the proper place	Rafael Mendonça França	2013-02-26	1	-2/+4
* \| \|	Merge pull request #9434 from zires/dev	Rafael Mendonça França	2013-02-26	3	-1/+7
\|\ \ \
\| * \| \|	Make ActionDispatch::Journey::Path::Pattern#new raise more meaningful excepti...	zires	2013-02-27	3	-1/+7
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #9442 from czarneckid/adjust-generator-language	Xavier Noria	2013-02-26	1	-1/+1
\|\ \ \
\| * \| \|	Use less hyperbole in the language re: allowed parameters	David Czarnecki	2013-02-26	1	-1/+1
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #9444 from frodsan/add_test_for_977455cc	Rafael Mendonça França	2013-02-26	1	-0/+16
\|\ \ \
\| * \| \|	Add tests for #9441	Francesco Rodriguez	2013-02-26	1	-0/+16
\| \|/ /
* \| \|	Update CHANGELOGS	Rafael Mendonça França	2013-02-26	7	-5/+30
* \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2013-02-26	13	-23/+37
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Typo fix	Carson McDonald	2013-02-25	1	-1/+1
\| * \|	BELONGS TO ASSOCIATION \| Typo fix	libin	2013-02-25	1	-1/+1
\| * \|	Update guide doc to use migration shortcuts	Qihuan Piao	2013-02-25	1	-1/+1
\| * \|	Wrap `around_action` word with <code> tag	Qihuan Piao	2013-02-25	1	-1/+1
\| * \|	Added documentation for beginning_of_minute and end_of_minute to Active Suppo...	Gagan Awhad	2013-02-22	1	-1/+19
\| * \|	Link is not relevant anymore	bobbus	2013-02-22	1	-5/+0
\| * \|	Typo fix.	Carson McDonald	2013-02-21	1	-1/+1
\| * \|	Update the "upgrading" guide for people coming from 3.0 and 3.1. The latest v...	Arne Brasseur	2013-02-20	1	-4/+4
\| * \|	improve grammar describing ActionDispatch::Cookies::CookieJar#delete	Weston Platter	2013-02-19	1	-1/+1
\| * \|	improve grammar describing ActionDispatch::Cookies::CookieJar#delete	Weston Platter	2013-02-19	1	-1/+1
\| * \|	Corrected link anchor and added colons for continuity	Doug Yun	2013-02-19	2	-3/+3
\| * \|	Fix bug in code example from layouts and rendering guide	Brian Kim	2013-02-18	1	-1/+2
\| * \|	Update guides/source/active_record_querying.md	Hanfei Shen	2013-02-19	1	-2/+2
\| * \|	clarify singular and plural routes	Noam Gagliardi	2013-02-18	1	-1/+1
* \| \|	Merge pull request #9441 from rubys/master	Guillermo Iguaran	2013-02-26	1	-2/+9
\|\ \ \
\| * \| \|	Allow both a path and an option on root in config/routes	Sam Ruby	2013-02-26	1	-2/+9
\|/ / /
* \| \|	Merge pull request #9414 from senny/9275_order_with_symbol_and_join	Rafael Mendonça França	2013-02-26	4	-2/+34
\|\ \ \
\| * \| \|	Expand order(:symbol) to "table".symbol to prevent broken queries on PG.	Yves Senn	2013-02-25	4	-3/+35
* \| \| \|	No need to send public methods	Akira Matsuda	2013-02-26	3	-3/+3
* \| \| \|	Merge pull request #9429 from frodsan/racc_jruby_incompatibility	Guillermo Iguaran	2013-02-25	1	-3/+3
\|\ \ \ \
\| * \| \| \|	JRuby does not support racc, include it only in ruby platform	Francesco Rodriguez	2013-02-26	1	-3/+3
* \| \| \| \|	Merge pull request #9419 from banyan/change-default-root-route-helper	Guillermo Iguaran	2013-02-25	3	-4/+4
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Change default root route helper	Kohei Hasegawa	2013-02-26	3	-4/+4
* \| \| \| \|	Apparently we can't get away from adding lib to the load path	José Valim	2013-02-25	1	-0/+1
* \| \| \| \|	Plugins can use a similar bootscript to Rails apps	José Valim	2013-02-25	1	-8/+3
* \| \| \| \|	Merge pull request #9425 from dickeyxxx/patch-1	Rafael Mendonça França	2013-02-25	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	small typo	Jeff Dickey	2013-02-25	1	-1/+1
\|/ / / /
* \| \| \|	Bundler 1.3.0 released. We prefer it for new binstub behavior.	Jeremy Kemper	2013-02-25	1	-1/+1
* \| \| \|	Bump i18n version to 0.6.2	Guillermo Iguaran	2013-02-25	1	-1/+1
* \| \| \|	Are was release	Rafael Mendonça França	2013-02-25	2	-3/+1
* \| \| \|	Bump sass-rails and coffee-rails to 4.0.0.beta1 in Gemfile	Guillermo Iguaran	2013-02-25	2	-3/+3
* \| \| \|	removes redundant require	Xavier Noria	2013-02-25	1	-2/+0
* \| \| \|	Merge pull request #9420 from robertomiranda/remove-sprockets-rails	Guillermo Iguaran	2013-02-25	1	-1/+0
\|\ \ \ \
\| * \| \| \|	Remove sprockets-rails from the Gemfile generator	robertomiranda	2013-02-25	1	-1/+0