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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
* \| \| \| \|	Merge pull request #10130 from Agis-/patch-2	Carlos Antonio da Silva	2013-04-08	1	-3/+3
\|\ \ \ \ \
\| * \| \| \| \|	Remove unused block parameters	Agis Anastasopoulos	2013-04-07	1	-3/+3
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #10131 from Agis-/metal_helper	Carlos Antonio da Silva	2013-04-08	1	-1/+0
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Remove unecessary variable call, `#sort!` always returns an array	Agis Anastasopoulos	2013-04-07	1	-1/+0
\|/ / / /
* \| \| \|	Minor AR changelog improvements [ci skip]	Carlos Antonio da Silva	2013-04-07	1	-4/+3
* \| \| \|	Avoid iterating over records hash when not necessary	Carlos Antonio da Silva	2013-04-07	1	-2/+6
* \| \| \|	Merge pull request #10127 from vipulnsward/each_to_each_value	Carlos Antonio da Silva	2013-04-07	2	-3/+3
\|\ \ \ \
\| * \| \| \|	each to each_value; remove unused vars	Vipul A M	2013-04-07	2	-3/+3
\|/ / / /
* \| \| \|	Merge pull request #10123 from wangjohn/added_bang_to_raise_nested_attributes...	Carlos Antonio da Silva	2013-04-06	1	-3/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Added a bang to the end of +raise_nested_attributes_record_not_found+	wangjohn	2013-04-06	1	-3/+3
\|/ / /
* \| \|	Merge pull request #10101 from wangjohn/refactoring_routing_mapper	Andrew White	2013-04-06	1	-12/+13
\|\ \ \
\| * \| \|	Refactoring some reused code into a method (inside of the routes	wangjohn	2013-04-05	1	-12/+13
* \| \| \|	Forgot to lock the uglifier version in our Gemfile	Rafael Mendonça França	2013-04-06	1	-1/+1
* \| \| \|	Merge pull request #10121 from Agis-/patch-2	Rafael Mendonça França	2013-04-06	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fix markdown formatting	Agis Anastasopoulos	2013-04-06	1	-1/+1
* \| \| \| \|	Merge pull request #10120 from vipulnsward/change_merge_on_new_hash	Rafael Mendonça França	2013-04-06	1	-3/+3
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	change some more merge to merge! on new hashes	Vipul A M	2013-04-06	1	-3/+3
* \| \| \| \|	sprockets 2.9.x doesn't work with uglifier 2.0 yet.	Rafael Mendonça França	2013-04-06	1	-2/+2
* \| \| \| \|	Merge pull request #10113 from Agis-/default_scopes_predicate	Rafael Mendonça França	2013-04-06	6	-6/+35
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|