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

	Commit message (Collapse)	Author	Age	Files	Lines
...
*	Move protected_instance_variables & view_assigns to AbstractController	Łukasz Strzałkowski	2013-08-25	2	-16/+24
\|
*	Include AbsC::Rendering interface in ActionMailer	Łukasz Strzałkowski	2013-08-25	1	-0/+3
\|
*	No need for .rb extension	Łukasz Strzałkowski	2013-08-25	1	-1/+1
\|
*	Remove 'api plugin' from docs	Łukasz Strzałkowski	2013-08-25	1	-3/+0
\| \| \| \|	AbstractController::Rendering is module which defines thie api
*	Create AbstractController::Rendering interface	Łukasz Strzałkowski	2013-08-25	11	-20/+69
\| \| \| \|	This interface should be use when implementing renderers.
*	Revert "Rename abstract_controller/rendering. to errors.rb"	Łukasz Strzałkowski	2013-08-25	2	-1/+1
\| \| \| \|	This reverts commit 6fe91ec5008838338e54ab8570f7c95ee0cdd8e8.
*	Rename abstract_controller/rendering. to errors.rb	Łukasz Strzałkowski	2013-08-25	2	-1/+1
\| \| \| \|	Since all rendering stuff was extracted to AV, the only thing that left was single class with error so file name wasn't relevant anymore
*	Fix AP test suite after moving stuff to AV	Łukasz Strzałkowski	2013-08-25	7	-6/+9
\|
*	Do not include AV::Rendering	Łukasz Strzałkowski	2013-08-25	1	-1/+0
\| \| \| \|	It's already included in Layouts, makes no sense to doubly include it
*	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
\| \| \| \|	Name was singular, should be plural
*	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
\| \| \| \|	This reverts commit 77bb03df2ca3687b290e9fe77d21007642f0329c.
*	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
\|\ \| \| \| \|	Skip tests using deprecated +proper_table_name+ method.
\| *	Adding deprecation assertions for proper_table_name.	wangjohn	2013-08-24	1	-7/+21
\|/ \| \| \|	This prevents deprecation warnings from popping up.
*	Merge pull request #12000 from ↵	Santiago Pastorino	2013-08-23	1	-7/+1
\|\ \| \| \| \| \| \| \| \|	wangjohn/deprecating_class_name_string_in_fixtures Deprecating passing strings as class name in fixtures.
\| *	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.
\| * \|	Making proper_table_name take in options.	wangjohn	2013-08-22	2	-19/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The options will specify the prefix and the suffix. Also, I'm moving the method to be an instance method on the +Migration+ instance. This makes more sense than being a class method on the +Migrator+ class because the only place that uses it is on a +Migration+ instance (in a method_missing hook). The logic for the Migrator shouldn't be doing any work to calculate the table name, it should be the Migration itself. Also made some small indentation fixes.
* \| \|	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
\|\ \ \ \| \|_\|/ \|/\| \|	Show exceptions in text format for xhr requests
\| * \|	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
\|\ \ \ \| \| \| \| \| \| \| \|	Docs: fix typo in file path, should include extension. [ci skip]
\| * \| \|	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 not used instance variable
\| * \| \|	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]
\| * \| \|	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
\|\ \ \ \| \|_\|/ \|/\| \|	Performance regression in AR::Base.respond_to?
\| * \|	Avoid compiling regexs in AR::Base.respond_to?	John Hawthorn	2013-08-21	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Caches the patterns of ActiveRecord::DynamicMatchers in a class instance variable.
* \| \|	Merge pull request #11976 from etehtsea/inf	Yves Senn	2013-08-22	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \|	[PG adapter] Use infinity const
\| * \| \|	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]
\| * \| \|	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 ↵	Rafael Mendonça França	2013-08-22	3	-4/+99
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	jetthoughts/add_action_controller_bug_report_template Added bug report template for ActionController
\| * \| \| \|	Added bug report template for ActionController	Paul Nikitochkin	2013-08-21	3	-4/+99
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	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]
\| * \| \|	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
\|\ \ \ \| \| \| \| \| \| \| \|	Use `Minitest::Test` instead of old `MiniTest::Unit::TestCase` for bug reports template
\| * \| \|	Updated bug report templates	Paul Nikitochkin	2013-08-21	2	-2/+2
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* use `Minitest::Test` instead of deprectaed `MiniTest::Unit::TestCase` [ci skip]
* \| \|	Merge pull request #11932 from gaurish/skip-encoding-convertor	Rafael Mendonça França	2013-08-21	2	-0/+16
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[JRuby] Skip few of the ActiveSupport's inflector test cases Conflicts: activesupport/test/abstract_unit.rb
\| * \| \|	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
\| \| \| \|