| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | Support render_template in view tests. Useful for specifying which | David Chelimsky | 2010-06-20 | 2 | -0/+9 | |
| | | | | | | | | | | | | | | | | | partials are rendered under different conditions. [#4903 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| | * | Don't use module to work out shallow name prefix and path as it may not ↵ | Andrew White | 2010-06-20 | 2 | -10/+33 | |
| | | | | | | | | | | | | | accurately reflect the actual namespace [#4899 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| | * | Make polymorphic_url and scaffolding work with uncountable resources [#3930 ↵ | Andrew White | 2010-06-20 | 11 | -11/+58 | |
| | | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| | * | Accept an object for :constraints option [#4904 state:resolved] | Andrew White | 2010-06-20 | 2 | -1/+9 | |
| | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| | * | Merge branch 'master' of github.com:rails/rails | José Valim | 2010-06-20 | 14 | -71/+165 | |
| | |\ | ||||||
| | | * | option_groups_from_collection_for_select should return HTML-safe string ↵ | Wincent Colaiuta | 2010-06-19 | 2 | -19/+13 | |
| | | | | | | | | | | | | | | | | | | | [#4879 state:resolved] Signed-off-by: Xavier Noria <fxn@hashref.com> | |||||
| | | * | Remove a relic of #request being in RackDelegation | wycats | 2010-06-19 | 2 | -6/+9 | |
| | | | | ||||||
| | | * | add missing shebang to rails bin. LH [#4885 state:resolved] | Scott Taylor | 2010-06-19 | 1 | -0/+2 | |
| | | | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| | | * | Custom resource routes should be scoped | Andrew White | 2010-06-19 | 2 | -7/+83 | |
| | | | | | | | | | | | | | | | | | | | [#3765] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| | | * | Fix Yajl backend discovery in ActiveSupport::JSON | Maxime RETY | 2010-06-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | [#4897 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| | | * | Fix test which prevents connection reset on failing and remove hardcoded ↵ | Master Lambaster | 2010-06-18 | 1 | -8/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | connection [#4689 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| | | * | Adds a few connection parameters for IBM databases. | Antonio Cangiano | 2010-06-18 | 1 | -24/+36 | |
| | | | | | | | | | | | | | | | | | | | [#3852] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| | | * | Fix bug with rolling back frozen attributes. | Brian Durand | 2010-06-18 | 4 | -6/+14 | |
| | | | | | | | | | | | | | | | | | | | [#2991] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| | * | | ActiveModel::Validations::Callbacks should not be required by default. | José Valim | 2010-06-19 | 5 | -22/+26 | |
| | | | | ||||||
| | * | | moving before_validation and after_validation functionality from ↵ | Neeraj Singh | 2010-06-19 | 6 | -34/+148 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord to ActiveModel [#4653 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| | * | | Clear DescendantsTracker on each request. | José Valim | 2010-06-19 | 7 | -40/+81 | |
| | | | | ||||||
| | * | | Remove descendants warning while executing tests. | José Valim | 2010-06-19 | 2 | -2/+5 | |
| | | | | ||||||
| | * | | ActiveRecord and ActionPack now use the new descendants implementation. | José Valim | 2010-06-19 | 5 | -49/+9 | |
| | | | | ||||||
| | * | | Change callbacks to automatically include DescendantsTracker and rename ↵ | José Valim | 2010-06-19 | 3 | -10/+17 | |
| | | | | | | | | | | | | | descendents to descendants. | |||||
| | * | | Add ActiveSupport::DescendantsTracker. | José Valim | 2010-06-19 | 3 | -0/+109 | |
| | |/ | ||||||
| | * | form_for without :html and with :remote should not error | David Genord II | 2010-06-18 | 2 | -1/+21 | |
| | | | | | | | | | | | | | [#4902 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| | * | fix for :shallow in router not generating helpers for create, update, and ↵ | Josh Kalderimis | 2010-06-18 | 2 | -5/+42 | |
| | | | | | | | | | | | | | | | | | destroy actions when :only or :except are used [#4900 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| | * | Credit for the heavy lifting! | Jeremy Kemper | 2010-06-17 | 1 | -1/+1 | |
| | | | ||||||
| | * | enable_stats added back in since Benchmarker doesn't start RubyProf | Gonçalo Silva | 2010-06-17 | 1 | -1/+9 | |
| | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| | * | check if the profiler patch is applied, otherwise GC::Profiler doesn't have ↵ | Gonçalo Silva | 2010-06-17 | 1 | -1/+1 | |
| | | | | | | | | | the 'data' method | |||||
| | * | added information about what is being used | Gonçalo Silva | 2010-06-17 | 1 | -2/+6 | |
| | | | ||||||
| | * | heap_live_objects+heap_free_objects is broken, use heap_total_objects instead | Gonçalo Silva | 2010-06-17 | 1 | -2/+1 | |
| | | | ||||||
| | * | also use GC profiler extended patch to retrieve GC time on 1.9 | Gonçalo Silva | 2010-06-17 | 1 | -1/+12 | |
| | | | ||||||
| | * | ruby's GC doesn't support the time method, removed support for it | Gonçalo Silva | 2010-06-17 | 1 | -4/+0 | |
| | | | ||||||
| | * | use GC profiler extended patch to retrieve GC runs on 1.9 | Gonçalo Silva | 2010-06-17 | 1 | -1/+12 | |
| | | | ||||||
| | * | ruby's GC doesn't support collections and heap_info, RubyProf can handle it | Gonçalo Silva | 2010-06-17 | 1 | -8/+0 | |
| | | | ||||||
| | * | GC at 1.9.X doesn't have malloc_allocated_size, remove support for it | Gonçalo Silva | 2010-06-17 | 1 | -12/+0 | |
| | | | ||||||
| | * | removed support for 1.8's GC alternative hacks (railsbench and lloyd ↵ | Gonçalo Silva | 2010-06-17 | 1 | -25/+0 | |
| | | | | | | | | | patches). RubyProf can handle it | |||||
| | * | check if the data method is defined (meaning it's correctly patched) | Gonçalo Silva | 2010-06-17 | 1 | -4/+4 | |
| | | | ||||||
| | * | the official profiler (present in 1.9) should have the highest priority | Gonçalo Silva | 2010-06-17 | 1 | -31/+31 | |
| | | | ||||||
| | * | don't set cpu_frequency if RubyProf resolved it | Gonçalo Silva | 2010-06-17 | 1 | -2/+2 | |
| | | | ||||||
| | * | setting the timezone in postgres to whatever ruby thinks the timezone is ↵ | Aaron Patterson | 2010-06-17 | 2 | -1/+11 | |
| | | | | | | | | | | | | | [#4895 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| | * | when the timezone is nil, a TimeWithZone object should not be constructed. ↵ | Aaron Patterson | 2010-06-17 | 3 | -0/+11 | |
| | | | | | | | | | | | | | [#4881 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| | * | Make text_helpers methods which return valid html to return it as safe and ↵ | Santiago Pastorino | 2010-06-17 | 2 | -46/+42 | |
| | | | | | | | | | | | | | | | | | sanitize the input always unless :sanitize => false is set [#4825 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | |||||
| | * | documents how to run an individual test in AR | Xavier Noria | 2010-06-17 | 1 | -0/+2 | |
| | | | ||||||
| | * | Add shallow routing option to new router [#3765 status:committed] | Andrew White | 2010-06-17 | 3 | -156/+383 | |
| | | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | |||||
| | * | excerpt shoudn't return safe output test added | Santiago Pastorino | 2010-06-17 | 1 | -0/+4 | |
| | | | | | | | | | | | | | [#4878] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | |||||
| | * | truncate() should not try to produce HTML-safe output | Wincent Colaiuta | 2010-06-17 | 2 | -22/+8 | |
| | | | | | | | | | | | | | | | | | | | | | As discussed in Lighthouse ticket #4825 and ticket #4878, the truncate() method cannot guarantee safe output for all possible inputs/offsets, so it is best to leave the output unsafe so that it gets escaped when used in a view. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | |||||
| | * | Merge branch 'master' of github.com:rails/rails | José Valim | 2010-06-17 | 11 | -142/+166 | |
| | |\ | ||||||
| | | * | pdoc tasks publishe APIs in api.rubyonrails.org | Xavier Noria | 2010-06-16 | 5 | -5/+5 | |
| | | | | ||||||
| | | * | use RDoc 2.2 to generate the documentation of individual components | Xavier Noria | 2010-06-16 | 7 | -4/+15 | |
| | | | | ||||||
| | | * | removes the documentation group from the Gemfile, thus making RDoc 2.2 ↵ | Xavier Noria | 2010-06-16 | 1 | -4/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | required in dev machines In order to generate the API with that particular version we need to activate the gem in the Rakefile before rake. Therefore the Rakefile does not honor --without for that group now. Installing rdoc is no big deal anyway. | |||||
| | | * | use assert_in_delta() for floating point comparisons in tests [#4871 ↵ | Aaron Patterson | 2010-06-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Carl Lerche <carllerche@mac.com> | |||||
| | | * | migrates the Jamis template to RDoc 2.x, the root Rakefile requires RDoc 2.2 | Xavier Noria | 2010-06-16 | 3 | -129/+145 | |
| | | | | | | | | | | | | | To understand the changes in horo.rb check rdoc/template.rb in a RDoc 2.x | |||||
| | * | | Add a failing test for ticket #4874 | José Valim | 2010-06-17 | 1 | -0/+14 | |
| | |/ | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |