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

	Commit message (Expand)	Author	Age	Files	Lines
*	Searching for rails executable correctly	Prathamesh Sonpatki	2013-04-10	2	-19/+14
*	Merge pull request #10165 from wangjohn/public_send_for_instance	Rafael Mendonça França	2013-04-10	1	-1/+1
\|\
\| *	Using public send instead of send for the PerThreadRegistry module.	wangjohn	2013-04-10	1	-1/+1
\|/
*	Merge pull request #10162 from choudhuryanupam/fix_activesupport_test	Carlos Antonio da Silva	2013-04-10	1	-2/+0
\|\
\| *	Removed unused setup	Anupam Choudhury	2013-04-10	1	-2/+0
\|/
*	Merge pull request #10160 from choudhuryanupam/fix_typo_n_grammar	Xavier Noria	2013-04-10	1	-1/+1
\|\
\| *	Fixed typo	Anupam Choudhury	2013-04-10	1	-1/+1
\|/
*	Return nil for Mime::NullType#ref	Andrew White	2013-04-10	2	-1/+5
*	Reverts rendering behavior when format is unknown	Grzegorz Świrski	2013-04-10	2	-2/+6
*	Add failing test case for #9654	Andrew White	2013-04-10	1	-0/+45
*	Merge pull request #10158 from steveklabnik/issue_10125	Steve Klabnik	2013-04-09	2	-2/+19
\|\
\| *	Fix inflector to respect default locale.	Nick Cox	2013-04-10	2	-2/+19
* \|	Merge pull request #10156 from wangjohn/grouping_thread_locals	Jeremy Kemper	2013-04-09	9	-19/+92
\|\ \ \| \|/ \|/\|
\| *	Changed the ScopeRegistry and the InstrumentationRegistry to use the	wangjohn	2013-04-09	3	-13/+12
\| *	Created a runtime registry for thread local variables in active record.	wangjohn	2013-04-09	5	-6/+39
\| *	Creating a module so that per thread registries can be easily created as	wangjohn	2013-04-09	1	-0/+41
\|/
*	Explain how to upgrade bin/ for Rails 4	Jeremy Kemper	2013-04-09	1	-8/+29
*	Merge pull request #10154 from killthekitten/fix_template_error_header	Carlos Antonio da Silva	2013-04-09	1	-1/+1
\|\
\| *	Use camelize instead of capitalize on error screen	Nikolay Shebanov	2013-04-10	1	-1/+1
* \|	Merge pull request #10103 from senny/get_action_mailer_guide_ready_for_prime_...	Steve Klabnik	2013-04-09	2	-118/+238
\|\ \ \| \|/ \|/\|
\| *	get the Action Mailer guide ready. [ci skip]	Yves Senn	2013-04-09	2	-118/+238
* \|	copy-edit pass in AM changelog [ci skip]	Xavier Noria	2013-04-09	1	-9/+11
* \|	Merge pull request #9843 from indirect/rails_bin	Rafael Mendonça França	2013-04-09	1	-10/+20
\|\ \
\| * \|	fix binstub typo	Andre Arko	2013-03-30	1	-1/+1
\| * \|	need to delete bin, not binstub, update wording	Andre Arko	2013-03-27	1	-4/+4
\| * \|	script/rails could never be from bundler	Andre Arko	2013-03-27	1	-1/+1
\| * \|	rails commands even if bin/rails is a gem stub	Andre Arko	2013-03-20	1	-10/+20
* \| \|	Fix typo	Rafael Mendonça França	2013-04-09	1	-2/+2
* \| \|	Merge pull request #10153 from choudhuryanupam/master	Rafael Mendonça França	2013-04-09	1	-4/+0
\|\ \ \
\| * \| \|	Removed unused setup	Anupam Choudhury	2013-04-09	1	-4/+0
\|/ / /
* \| \|	Merge pull request #10142 from wangjohn/grouping_thread_locals	Rafael Mendonça França	2013-04-09	2	-9/+16
\|\ \ \
\| * \| \|	Delegating the value getter and setters in the ScopeRegistry to the	wangjohn	2013-04-08	2	-9/+16
* \| \| \|	Merge pull request #10151 from neerajdotname/ar-to-klass	Rafael Mendonça França	2013-04-09	4	-12/+12
\|\ \ \ \
\| * \| \| \|	changed variable name active_record => base_klass	Neeraj Singh	2013-04-09	4	-12/+12
* \| \| \| \|	Merge pull request #10138 from hbakhtiyor/test-dirs-environment	Rafael Mendonça França	2013-04-09	1	-2/+3
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Add TEST_DIRS enviroment for constrain test directories in rakefile	Abd ar-Rahman Hamidi	2013-04-08	1	-2/+3
* \| \| \| \|	Merge pull request #10148 from vipulnsward/traces_change	Carlos Antonio da Silva	2013-04-09	1	-6/+4
\|\ \ \ \ \
\| * \| \| \| \|	change array of array to hash	Vipul A M	2013-04-09	1	-6/+4
* \| \| \| \| \|	Merge pull request #10147 from vipulnsward/fix_AP_live_warning	Carlos Antonio da Silva	2013-04-08	2	-1/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	fix AP warning; remove unused variable	Vipul A M	2013-04-09	2	-1/+2
\|/ / / / /
* \| \| \| \|	Merge pull request #10145 from wangjohn/instrumentation_registry_creation	Rafael Mendonça França	2013-04-08	1	-1/+27
\|\ \ \ \ \
\| * \| \| \| \|	Creating an object to consolidate thread locals which hold the	wangjohn	2013-04-08	1	-1/+27
\|/ / / / /
* \| \| \| \|	Merge pull request #10143 from Agis-/mark_unused_vars	Rafael Mendonça França	2013-04-08	9	-13/+13
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Mark unused variables and make some style fixes	Agis Anastasopoulos	2013-04-08	9	-13/+13
\|/ / / /
* \| \| \|	Merge pull request #10135 from wangjohn/grouping_thread_locals	Rafael Mendonça França	2013-04-08	3	-6/+57
\|\ \ \ \
\| * \| \| \|	Grouping thread locals in the ActiveRecord scopes so that the	wangjohn	2013-04-08	3	-6/+57
\|/ / / /
* \| \| \|	Merge pull request #9604 from sgrif/live_streaming_exceptions	Rafael Mendonça França	2013-04-08	2	-1/+103
\|\ \ \ \
\| * \| \| \|	Exception handling for controllers using ActionController::Live	Sean Griffin	2013-03-18	2	-1/+103
* \| \| \| \|	Merge pull request #10122 from wangjohn/adding_documentation_to_form_builder	Rafael Mendonça França	2013-04-08	1	-2/+55
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Added documentation to the FormBuilder class, should help	wangjohn	2013-04-06	1	-2/+55