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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \|	rack-mount 0.4	Joshua Peek	2009-12-26	3	-21/+21
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Expect Rack 1.1	Joshua Peek	2009-12-26	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add new finder methods to association collection.	Pratik Naik	2009-12-27	7	-13/+38
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Ensure Model.scoped adds type conditions for STI models	Pratik Naik	2009-12-27	3	-12/+16
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Ensure all the finder methods respect scoping	Pratik Naik	2009-12-26	2	-2/+7
\|/ / / / / / /
* \| \| \| \| \| \|	Add relation.reload to force reloading the records	Pratik Naik	2009-12-26	3	-0/+29
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Cache the loaded relations	Pratik Naik	2009-12-26	2	-33/+75
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Ensure preload and eager_load finder methods accept multiple arguments	Pratik Naik	2009-12-26	2	-6/+12
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Make sure the relations are always immutable	Pratik Naik	2009-12-26	1	-8/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Add support for multiple arguments to .where finder	Pratik Naik	2009-12-26	2	-2/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Add missing changelog entries	Pratik Naik	2009-12-26	1	-0/+25
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Add Relation#all as an alias for to_a	Pratik Naik	2009-12-26	2	-0/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Stop supporting blank arguments to AR#relation query methods	Pratik Naik	2009-12-26	1	-27/+19
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Rename Model.conditions and relation.conditions to .where	Pratik Naik	2009-12-26	7	-20/+20
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	No parentheses for assert_equal	Pratik Naik	2009-12-26	1	-6/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Add Model.select/group/order/limit/joins/conditions/preload/eager_load class ↵	Pratik Naik	2009-12-26	4	-59/+88
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	methods returning a lazy relation. Examples : posts = Post.select('id).order('name') # Returns a lazy relation posts.each {\|p\| puts p.id } # Fires "select id from posts order by name"
* \| \| \| \| \| \|	Merge remote branch 'jose/am'	Yehuda Katz	2009-12-25	24	-1422/+113
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix whiny_nil tests, improve error messages and make CI happy.	José Valim	2009-12-25	1	-6/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Refactor multiple parts logic and move Utils to PartContainer.	José Valim	2009-12-25	4	-31/+24
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	adv_attr_accessors in ActionMailer are not sent to the views, use the mailer ↵	José Valim	2009-12-25	6	-42/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	object if you need to access the subject, recipients, from, etc.
\| * \| \| \| \| \| \|	Move i18n to Gemfile.	José Valim	2009-12-25	15	-1345/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' of git://github.com/rails/rails	José Valim	2009-12-25	81	-915/+960
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' of git://github.com/rails/rails	José Valim	2009-12-22	35	-294/+508
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'master' of git://github.com/rails/rails	José Valim	2009-12-21	114	-857/+1820
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'master' of git://github.com/rails/rails	José Valim	2009-12-11	99	-1592/+1833
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' of git://github.com/rails/rails	José Valim	2009-12-02	77	-295/+439
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' of git://github.com/rails/rails	José Valim	2009-12-01	17	-476/+545
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' of git://github.com/rails/rails	José Valim	2009-11-25	20	-142/+154
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' of git://github.com/rails/rails	José Valim	2009-11-24	14	-255/+177
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of git://github.com/rails/rails	José Valim	2009-11-23	2	-3/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' of git://github.com/rails/rails	José Valim	2009-11-23	88	-1537/+907
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' of git://github.com/rails/rails	José Valim	2009-11-11	216	-1447/+1689
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' of git://github.com/rails/rails	José Valim	2009-11-02	447	-7603/+6360
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' of git://github.com/rails/rails	José Valim	2009-10-16	42	-90/+137
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Model.scoped now returns a relation if invoked without any arguments	Pratik Naik	2009-12-26	2	-11/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Example : posts = Post.scoped posts.size # Fires "select count() from posts" and returns the count posts.each {\|p\| puts p.name } # Fires "select from posts" and loads post objects
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The controller key shouldnt be part of the mapping if its not used	David Heinemeier Hansson	2009-12-25	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix tests	David Heinemeier Hansson	2009-12-25	1	-2/+2
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This code was needed to work around ↵	Yehuda Katz	2009-12-24	1	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	http://redmine.ruby-lang.org/issues/show/2494. Since that bug is now closed in Ruby, we can remove it.
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simplify and improve the performance of output_safety	Yehuda Katz	2009-12-24	1	-22/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of marking raw text in templates as safe, and then putting them ↵	Yehuda Katz	2009-12-24	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	through String#<< which checks if the String is safe, use safe_concat, which uses the original (internal) String#<< and leaves the safe flag as is. Results in a significant performance improvement.
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dead code	Yehuda Katz	2009-12-24	1	-15/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Translated strings in the view are assumed html_safe (Closes #3401)	David Heinemeier Hansson	2009-12-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stray carrier return	David Heinemeier Hansson	2009-12-24	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The new routes shortform now also works for :as	David Heinemeier Hansson	2009-12-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge	David Heinemeier Hansson	2009-12-24	33	-390/+441
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix new schema test dependency on Hash#to_xml	Jeremy Kemper	2009-12-23	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow named_routes to be used with root, and with new DSL short-form.	Sam Ruby	2009-12-23	2	-8/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The real use case it to make all of the following act the same: root 'store#index', :as => 'store' match '/' => 'store#index', :as => 'store' match '/', :to => 'store#index', :as => 'store' The test case provided deviates from this in order to demonstrate all three forms in a single set of test routes. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote branch 'origin/master'	Carlhuda	2009-12-23	10	-79/+51
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: railties/lib/rails/application.rb
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix reference to Application#configuration to use #config	Jeremy Kemper	2009-12-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Isolation tests intentionally avoid loading any state (because they're often ↵	Carlhuda	2009-12-23	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	testing things that have their own load path semantics that should not be polluted), so rack/test is not yet on the load path. Moving require "rack/test" into the setup means and after boot_rails means that it'll be required after the laod path has been altered to add in the Rails vendor/gems