aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Break instrumentation into several end-points so rendering of partials can ↵José Valim2009-12-263-30/+42
| | | | be optimized.
* Wrap layout rendering in one method: _render_layout (this should make ↵José Valim2009-12-262-7/+7
| | | | partial instrumentation easier).
* String#<< should work for any object which responds to :to_str, so enable ↵José Valim2009-12-262-0/+36
| | | | this without the performance hit and make Fixnum safe by default.
* Add relation.reload to force reloading the recordsPratik Naik2009-12-263-0/+29
|
* Cache the loaded relationsPratik Naik2009-12-262-33/+75
|
* Ensure preload and eager_load finder methods accept multiple argumentsPratik Naik2009-12-262-6/+12
|
* Make sure the relations are always immutablePratik Naik2009-12-261-8/+5
|
* Add support for multiple arguments to .where finderPratik Naik2009-12-262-2/+8
|
* Add missing changelog entriesPratik Naik2009-12-261-0/+25
|
* Add Relation#all as an alias for to_aPratik Naik2009-12-262-0/+8
|
* Stop supporting blank arguments to AR#relation query methodsPratik Naik2009-12-261-27/+19
|
* Rename Model.conditions and relation.conditions to .wherePratik Naik2009-12-267-20/+20
|
* No parentheses for assert_equalPratik Naik2009-12-261-6/+6
|
* Add Model.select/group/order/limit/joins/conditions/preload/eager_load class ↵Pratik Naik2009-12-264-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 Katz2009-12-2524-1422/+113
|\
| * Fix whiny_nil tests, improve error messages and make CI happy.José Valim2009-12-251-6/+7
| |
| * Refactor multiple parts logic and move Utils to PartContainer.José Valim2009-12-254-31/+24
| |
| * adv_attr_accessors in ActionMailer are not sent to the views, use the mailer ↵José Valim2009-12-256-42/+79
| | | | | | | | object if you need to access the subject, recipients, from, etc.
| * Move i18n to Gemfile.José Valim2009-12-2515-1345/+5
| |
| * Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-2581-915/+960
| |\
| * \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-2235-294/+508
| |\ \
| * \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-21114-857/+1820
| |\ \ \
| * \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-1199-1592/+1833
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-0277-295/+439
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-0117-476/+545
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-2520-142/+154
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-2414-255/+177
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-232-3/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-2388-1537/+907
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-11216-1447/+1689
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-02447-7603/+6360
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-10-1642-90/+137
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | Model.scoped now returns a relation if invoked without any argumentsPratik Naik2009-12-262-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 usedDavid Heinemeier Hansson2009-12-251-2/+2
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Fix testsDavid Heinemeier Hansson2009-12-251-2/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | This code was needed to work around ↵Yehuda Katz2009-12-241-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_safetyYehuda Katz2009-12-241-22/+6
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Instead of marking raw text in templates as safe, and then putting them ↵Yehuda Katz2009-12-242-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 codeYehuda Katz2009-12-241-15/+0
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Translated strings in the view are assumed html_safe (Closes #3401)David Heinemeier Hansson2009-12-241-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Stray carrier returnDavid Heinemeier Hansson2009-12-241-1/+0
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | The new routes shortform now also works for :asDavid Heinemeier Hansson2009-12-241-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | MergeDavid Heinemeier Hansson2009-12-2433-390/+441
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix new schema test dependency on Hash#to_xmlJeremy Kemper2009-12-231-0/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Allow named_routes to be used with root, and with new DSL short-form.Sam Ruby2009-12-232-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'Carlhuda2009-12-2310-79/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: railties/lib/rails/application.rb
| | * | | | | | | | | | | | | | Fix reference to Application#configuration to use #configJeremy Kemper2009-12-231-1/+1
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Isolation tests intentionally avoid loading any state (because they're often ↵Carlhuda2009-12-231-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
| | * | | | | | | | | | | | | | Routing: fix that route shorthand shouldn't ignore other options. Raise if ↵Jeremy Kemper2009-12-232-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | :as option is given to root method since its name is always 'root'
| | * | | | | | | | | | | | | | Fix Rack::Lock middleware condition: use *unless* we allow concurrencyJeremy Kemper2009-12-231-1/+1
| | | | | | | | | | | | | | | |