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

	Commit message (Expand)	Author	Age	Files	Lines
*	Logs should show overridden method; Issue 426	David Lee	2011-05-07	5	-5/+53
*	adds comments clarifying the role of SharedGeneratorTests	Xavier Noria	2011-05-07	3	-0/+7
*	Merge pull request #424 from gnufied/master	José Valim	2011-05-06	2	-2/+27
\|\
\| *	fix yield not working from around filter of observers, fixes Github#329	Hemant Kumar	2011-05-07	2	-2/+27
* \|	Revert the merge because tests did not pass.	José Valim	2011-05-06	3	-44/+5
* \|	Merge pull request #423 from richardiux/master	José Valim	2011-05-06	3	-5/+44
\|\ \
\| * \|	Adding base method symbolized_sti_name to activerecord base to be used on ide...	Richard Millan	2011-05-06	3	-9/+15
\| * \|	Test: identity on inherited classes should behave the same when turned on or off	Richard Millan	2011-05-05	1	-0/+16
\| * \|	Testing identity map on inherited active record classes. Distinct models tha...	Richard Millan	2011-05-05	1	-0/+17
* \| \|	Merge pull request #419 from smartinez87/avail_action	José Valim	2011-05-06	1	-2/+2
\|\ \ \
\| * \| \|	better styling on #available_action? docs	Sebastian Martinez	2011-05-06	1	-2/+2
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #418 from myronmarston/am_observer_doc_updates	Aaron Patterson	2011-05-06	3	-3/+53
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Add documentation for new observer enable/disable feature.	Myron Marston	2011-05-06	3	-3/+53
\|/ /
* \|	Revert to old semantics, use available_action? instead of action_method?.	José Valim	2011-05-06	4	-28/+38
* \|	Merge pull request #389 from jasonrudolph/always_flush_logger_at_exit	José Valim	2011-05-06	3	-14/+22
\|\ \
\| * \|	Add test to verify production rake tasks flush logger on exit	Jason Rudolph	2011-05-06	1	-0/+13
\| * \|	Always flush logger at exit	Jason Rudolph	2011-05-06	2	-14/+9
\|/ /
* \|	Merge pull request #414 from asanghi/lh5796	José Valim	2011-05-06	4	-12/+20
\|\ \
\| * \|	be consistent	Aditya Sanghi	2011-05-06	1	-3/+1
\| * \|	review fixes	Aditya Sanghi	2011-05-06	3	-6/+11
\| * \|	default orm and test_framework to false; change application.rb template accor...	Aditya Sanghi	2011-05-06	3	-12/+12
\| * \|	When skipping skip active record, mark config.generators.orm to false; LH 579...	Aditya Sanghi	2011-05-06	2	-1/+6
* \| \|	Don't pluralize, camelize.	José Valim	2011-05-06	2	-3/+3
* \| \|	More updates to ivars list.	José Valim	2011-05-06	5	-7/+11
* \| \|	Move variables to underscore format, update protected instance variables list.	José Valim	2011-05-06	6	-23/+41
\|/ /
* \|	Merge pull request #410 from asanghi/LH6074	José Valim	2011-05-06	2	-3/+18
\|\ \
\| * \|	strip space	Aditya Sanghi	2011-05-06	1	-2/+2
\| * \|	Take leap years into account more seriously when calculating year distance [#...	Aditya Sanghi	2011-05-06	2	-3/+18
* \| \|	Merge pull request #396 from asanghi/lh_4346	Xavier Noria	2011-05-06	2	-29/+187
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Multiparameter POLA, time_select fixes. See LH4346	Aditya Sanghi	2011-05-05	2	-29/+187
* \| \|	Merge pull request #408 from etdsoft/master	José Valim	2011-05-06	1	-1/+2
\|\ \ \
\| * \| \|	Take into account the Rack::Server :SSLEnable option when building the applic...	Daniel Martin	2011-05-06	1	-1/+2
\|/ / /
* \| \|	Ensure params wrapper settings are not inherited and calculated each time.	José Valim	2011-05-06	2	-4/+28
* \| \|	Update CHANGELOGs.	José Valim	2011-05-06	3	-21/+18
* \| \|	Merge pull request #400 from arunagw/ruby_prof	José Valim	2011-05-05	1	-5/+3
\|\ \ \
\| * \| \|	Grouped the ruby-prof into test.	Arun Agrawal	2011-05-05	1	-1/+4
\| * \| \|	Removing from duplicate places. Only in Ruby platform needed.	Arun Agrawal	2011-05-05	1	-2/+1
\| * \| \|	adding ruby-prof gem for ruby platform only #jruby	Vishnu Atrai	2011-05-05	1	-5/+1
* \| \| \|	Merge pull request #399 from ernie/join_conditions_on_join	Jon Leighton	2011-05-05	2	-3/+14
\|\ \ \ \
\| * \| \| \|	Add a test for outer joins with conditions where value IS NULL	Ernie Miller	2011-05-05	1	-0/+5
\| * \| \| \|	Add join conditions to JOIN clause, not WHERE	Ernie Miller	2011-05-05	2	-3/+9
\| \|/ / /
* \| \| \|	Merge pull request #358 from baroquebobcat/fix_find_or_create_master	Aaron Patterson	2011-05-05	2	-3/+30
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix for lighthouse #6741	Nick Howard	2011-05-01	2	-3/+30
* \| \| \|	Merge pull request #397 from dchelimsky/view-path-decorator	José Valim	2011-05-05	0	-0/+0
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	rename test case to better describe use case	David Chelimsky	2011-04-23	1	-6/+6
* \| \| \|	Merge pull request #394 from splattael/fix_rake_routes_shows_custom_assets	José Valim	2011-05-05	2	-1/+10
\|\ \ \ \
\| * \| \| \|	Display custom asset routes in `rake routes`	Peter Suschlik	2011-05-05	2	-1/+10
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #392 from janx/master	José Valim	2011-05-05	3	-43/+117
\|\ \ \ \
\| * \| \| \|	add tests for performance test	Jan Xie	2011-05-05	2	-0/+29
\| * \| \| \|	minitest/ruby19 compatible performance test	Jan Xie	2011-05-05	1	-43/+88
\| \|/ / /