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

	Commit message (Expand)	Author	Age	Files	Lines
...
*	Integrate ActionMailer with ActionView	Łukasz Strzałkowski	2013-08-25	2	-2/+6
*	Fix eager_autoload for layouts	Łukasz Strzałkowski	2013-08-25	1	-1/+1
*	Fix AV tests, I18nProxy was moved to AV	Łukasz Strzałkowski	2013-08-25	1	-1/+1
*	Revert "Require only path_set && lookup_context instead of whole base"	Łukasz Strzałkowski	2013-08-25	1	-2/+1
*	Hook up AV::Rendering on AV intialization	Łukasz Strzałkowski	2013-08-25	3	-3/+7
*	Move layouts to AV	Łukasz Strzałkowski	2013-08-25	5	-2/+432
*	Add loading 'action_view' as part of rails/all	Łukasz Strzałkowski	2013-08-25	1	-0/+1
*	Move rendering from AP to AV	Łukasz Strzałkowski	2013-08-25	7	-613/+189
*	Require only path_set && lookup_context instead of whole base	Łukasz Strzałkowski	2013-08-25	1	-1/+2
*	Move view_paths from AP to AV	Łukasz Strzałkowski	2013-08-25	6	-2/+2
*	Merge pull request #12008 from wangjohn/skipping_deprecated_migration_tests	Santiago Pastorino	2013-08-24	1	-7/+21
\|\
\| *	Adding deprecation assertions for proper_table_name.	wangjohn	2013-08-24	1	-7/+21
\|/
*	Merge pull request #12000 from wangjohn/deprecating_class_name_string_in_fixt...	Santiago Pastorino	2013-08-23	1	-7/+1
\|\
\| *	Deprecating passing strings as class name in fixtures.	wangjohn	2013-08-23	1	-7/+1
* \|	Merge pull request #11984 from wangjohn/proper_table_name	Santiago Pastorino	2013-08-23	2	-19/+68
\|\ \
\| * \|	Making proper_table_name take in options.	wangjohn	2013-08-22	2	-19/+68
* \| \|	typo [ci skip]	Xavier Noria	2013-08-23	1	-1/+1
* \| \|	Merge pull request #11960 from kirs/xhr-errors	Rafael Mendonça França	2013-08-23	15	-13/+129
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Display exceptions in text format for xhr request	Kir Shatrov	2013-08-22	15	-13/+129
* \| \|	cleans the guides sources from fancy non-ASCII stuff	Xavier Noria	2013-08-23	21	-96/+96
* \| \|	Merge pull request #11996 from semaperepelitsa/master	Yves Senn	2013-08-23	1	-1/+1
\|\ \ \
\| * \| \|	Fix typo in file path, should include extension.	Semyon Perepelitsa	2013-08-23	1	-1/+1
\|/ / /
* \| \|	Merge pull request #11994 from rajcybage/fix_instance	Carlos Antonio da Silva	2013-08-23	1	-2/+1
\|\ \ \
\| * \| \|	remove unused instance variable	Rajarshi Das	2013-08-23	1	-2/+1
* \| \| \|	Merge pull request #11991 from prathamesh-sonpatki/note-edge-guides	Yves Senn	2013-08-23	1	-2/+4
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Add a note about edge guides in the feedback section[ci skip]	Prathamesh Sonpatki	2013-08-23	1	-2/+4
\|/ / /
* \| \|	Merge pull request #11971 from freerunningtechnologies/dynamic_respond_to	Aaron Patterson	2013-08-22	2	-1/+6
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Avoid compiling regexs in AR::Base.respond_to?	John Hawthorn	2013-08-21	2	-1/+6
* \| \|	Merge pull request #11976 from etehtsea/inf	Yves Senn	2013-08-22	1	-2/+2
\|\ \ \
\| * \| \|	Use infinity const	Konstantin Shabanov	2013-08-22	1	-2/+2
\| \|/ /
* \| \|	Merge pull request #11943 from suginoy/ar-order-notation	Yves Senn	2013-08-22	1	-0/+10
\|\ \ \
\| * \| \|	Add examples of AR order method's hash notation to Rails Guide [ci skip]	Sugino Yasuhiro	2013-08-22	1	-0/+10
* \| \| \|	Merge pull request #11967 from jetthoughts/add_action_controller_bug_report_t...	Rafael Mendonça França	2013-08-22	3	-4/+99
\|\ \ \ \
\| * \| \| \|	Added bug report template for ActionController	Paul Nikitochkin	2013-08-21	3	-4/+99
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #11978 from edogawaconan/fix_doc_collection_proxy	Yves Senn	2013-08-22	1	-2/+0
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Stray nodoc causes rest of file not parsed [ci skip]	edogawaconan	2013-08-22	1	-2/+0
\|/ / /
* \| \|	Merge pull request #11966 from jetthoughts/update_bug_report_templates	Rafael Mendonça França	2013-08-21	2	-2/+2
\|\ \ \
\| * \| \|	Updated bug report templates	Paul Nikitochkin	2013-08-21	2	-2/+2
\|/ / /
* \| \|	Merge pull request #11932 from gaurish/skip-encoding-convertor	Rafael Mendonça França	2013-08-21	2	-0/+16
\|\ \ \
\| * \| \|	Define jruby_skip to skip test on JRuby	Gaurish Sharma	2013-08-21	1	-0/+5
\| * \| \|	Skip few of the ActiveSupport'sinflector test on JRuby	Gaurish Sharma	2013-08-21	1	-0/+10
* \| \| \|	Merge pull request #11850 from razielgn/mod-delegation-backtrace	Rafael Mendonça França	2013-08-21	1	-2/+1
\|\ \ \ \
\| * \| \| \|	Rely on NoMethodError#name when deciding to raise DelegationError.	Federico Ravasio	2013-08-12	1	-2/+1
* \| \| \| \|	Merge pull request #11959 from razielgn/skip-global-safe-tests-on-rubinius	Rafael Mendonça França	2013-08-21	2	-0/+6
\|\ \ \ \ \
\| * \| \| \| \|	Skip tests involving $SAFE, it's not supported on Rubinius.	Federico Ravasio	2013-08-21	1	-0/+2
\| * \| \| \| \|	Added method to skip tests on Rubinius to AS/abstract_unit.	Federico Ravasio	2013-08-21	1	-0/+4
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge pull request #11961 from Intrepidd/debug-exception-html	Rafael Mendonça França	2013-08-21	5	-5/+5
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Escape the message of an exception in debug_exceptions to avoid bad rendering	Adrien Siami	2013-08-21	5	-5/+5
\|/ / / /
* \| \| \|	Merge pull request #11952 from lmarcetic/master	Guillermo Iguaran	2013-08-20	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Remove set_primary_key, replace with primary_key=	Luka Marčetić	2013-08-21	1	-2/+2
\|/ / / /