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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Deprecate ActiveRecord#Base.default_scopes?	Agis-	2013-04-06	2	-1/+15
\| * \| \|	Add option to Class#class_attribute for skipping the query method	Agis-	2013-04-06	4	-5/+20
\|/ / /
* \| \|	Bring back ActiveRecord::Base#connection_handler removed by mistake on b37399ab	Rafael Mendonça França	2013-04-06	1	-0/+4
* \| \|	Merge pull request #10118 from vipulnsward/remove_unused_var_task	Carlos Antonio da Silva	2013-04-06	2	-2/+1
\|\ \ \
\| * \| \|	remove unused variables	Vipul A M	2013-04-06	2	-2/+1
* \| \| \|	`fast_xs` support has been removed. Use 'String#encode(xml: :attr)`.	Aaron Patterson	2013-04-05	3	-19/+2
\|/ / /
* \| \|	updating the guide	Aaron Patterson	2013-04-05	1	-5/+5
* \| \|	add integration test for shorthand rake tests	Aaron Patterson	2013-04-05	1	-0/+7
* \| \|	rake test app/model/foo.rb and rake test models/foo works	Aaron Patterson	2013-04-05	2	-3/+47
* \| \|	extract test info from the command line and set up the test task	Aaron Patterson	2013-04-05	2	-5/+28
* \| \|	add a class for splitting up rake commands	Aaron Patterson	2013-04-05	2	-0/+70
* \| \|	just use ruby to run tests	Aaron Patterson	2013-04-05	1	-4/+4
* \| \|	removing `rails test`, updating docs to show how to use `rake test`	Aaron Patterson	2013-04-05	5	-194/+19
* \| \|	Merge pull request #10111 from Agis-/patch-1	Carlos Antonio da Silva	2013-04-05	1	-4/+4
\|\ \ \
\| * \| \|	Remove extra whitespace	Agis Anastasopoulos	2013-04-06	1	-4/+4
* \| \| \|	Update Rake tasks to call `rails test` instead	Prem Sichanugrist	2013-04-05	1	-7/+10
\|/ / /
* \| \|	Merge branch 'railstest'	Aaron Patterson	2013-04-05	7	-92/+95
\|\ \ \
\| * \ \	Merge branch 'master' into railstest	Aaron Patterson	2013-04-05	49	-94/+345
\| \|\ \ \
\| * \| \| \|	do not blow away the test database on every run	Aaron Patterson	2013-04-05	1	-10/+0