aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed date_select date_separator when discard_month and/or discard_day are ↵Thibaud Guillaume-Gentil2010-06-202-2/+31
| | | | | | true [#4856 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Add test for migration generator with name not starting with add or remove. ↵rohit2010-06-201-0/+15
| | | | | | [#4835 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
* Fix problem with migrations template that can cause bogus code to be createdSteve Abatangle2010-06-201-4/+8
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Adding missing test to autolink with other protocols (file) [#4886 ↵Carlos Antonio da Silva2010-06-201-0/+1
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Make sure a namespaced <%= render form %> still renders the _form partial ↵Jan De Poorter2010-06-203-1/+13
| | | | | | [#4784 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Added absolute path for config.ru as well. Turns out this is also needed to ↵Ryan Duryea2010-06-201-1/+2
| | | | | | | | fix the daemon issue under ruby 1.8.7 [#4531 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Pass rack the absolute path of server's pid fileRyan Duryea2010-06-201-1/+1
| | | | | | | | | When running as a daemon, rack will cd to "/" and paths relative to the root of the rails app aren't valid when rack is setting up. Because of this, "rails server -d" was failing silently when trying to write it's pid file Signed-off-by: José Valim <jose.valim@gmail.com>
* Use Rack::Utils.bytesize when calculating content-length of exception pages. ↵Tarsoly András2010-06-201-1/+1
| | | | | | [#4727 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Adds titleize/titlecase to AS::Multibyte::CharsNorman Clarke2010-06-202-0/+24
| | | | | | [#2794 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* remove executable permission from files that don't need it. [#4802 ↵rohit2010-06-2017-0/+0
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Refactor build_arel: move joins out and simplify havings. [#4860 state:resolved]Emilio Tagua2010-06-201-46/+46
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* <=> is defined twice on multibyte/chars.rb for Ruby < 1.9Sam Elliott and Santiago Pastorino2010-06-201-14/+10
| | | | | | [#4850 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
* Don't overwrite unsaved updates when loading an association but preserve the ↵James Le Cuirot2010-06-203-3/+28
| | | | | | | | order of the loaded records. Reapplied from before but now allows already-saved records to be refreshed. [#4830 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Strip trailing whitespace from generated applications [#4905 state:resolved]Chris Griego2010-06-205-8/+8
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Support render_template in view tests. Useful for specifying whichDavid Chelimsky2010-06-202-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 White2010-06-202-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 White2010-06-2011-11/+58
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Accept an object for :constraints option [#4904 state:resolved]Andrew White2010-06-202-1/+9
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge branch 'master' of github.com:rails/railsJosé Valim2010-06-2014-71/+165
|\
| * option_groups_from_collection_for_select should return HTML-safe string ↵Wincent Colaiuta2010-06-192-19/+13
| | | | | | | | | | | | [#4879 state:resolved] Signed-off-by: Xavier Noria <fxn@hashref.com>
| * Remove a relic of #request being in RackDelegationwycats2010-06-192-6/+9
| |
| * add missing shebang to rails bin. LH [#4885 state:resolved]Scott Taylor2010-06-191-0/+2
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Custom resource routes should be scopedAndrew White2010-06-192-7/+83
| | | | | | | | | | | | [#3765] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Fix Yajl backend discovery in ActiveSupport::JSONMaxime RETY2010-06-181-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 Lambaster2010-06-181-8/+7
| | | | | | | | | | | | | | | | connection [#4689 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Adds a few connection parameters for IBM databases.Antonio Cangiano2010-06-181-24/+36
| | | | | | | | | | | | [#3852] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Fix bug with rolling back frozen attributes.Brian Durand2010-06-184-6/+14
| | | | | | | | | | | | [#2991] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | ActiveModel::Validations::Callbacks should not be required by default.José Valim2010-06-195-22/+26
| |
* | moving before_validation and after_validation functionality from ↵Neeraj Singh2010-06-196-34/+148
| | | | | | | | | | | | | | | | ActiveRecord to ActiveModel [#4653 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Clear DescendantsTracker on each request.José Valim2010-06-197-40/+81
| |
* | Remove descendants warning while executing tests.José Valim2010-06-192-2/+5
| |
* | ActiveRecord and ActionPack now use the new descendants implementation.José Valim2010-06-195-49/+9
| |
* | Change callbacks to automatically include DescendantsTracker and rename ↵José Valim2010-06-193-10/+17
| | | | | | | | descendents to descendants.
* | Add ActiveSupport::DescendantsTracker.José Valim2010-06-193-0/+109
|/
* form_for without :html and with :remote should not errorDavid Genord II2010-06-182-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 Kalderimis2010-06-182-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 Kemper2010-06-171-1/+1
|
* enable_stats added back in since Benchmarker doesn't start RubyProfGonçalo Silva2010-06-171-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 Silva2010-06-171-1/+1
| | | | the 'data' method
* added information about what is being usedGonçalo Silva2010-06-171-2/+6
|
* heap_live_objects+heap_free_objects is broken, use heap_total_objects insteadGonçalo Silva2010-06-171-2/+1
|
* also use GC profiler extended patch to retrieve GC time on 1.9Gonçalo Silva2010-06-171-1/+12
|
* ruby's GC doesn't support the time method, removed support for itGonçalo Silva2010-06-171-4/+0
|
* use GC profiler extended patch to retrieve GC runs on 1.9Gonçalo Silva2010-06-171-1/+12
|
* ruby's GC doesn't support collections and heap_info, RubyProf can handle itGonçalo Silva2010-06-171-8/+0
|
* GC at 1.9.X doesn't have malloc_allocated_size, remove support for itGonçalo Silva2010-06-171-12/+0
|
* removed support for 1.8's GC alternative hacks (railsbench and lloyd ↵Gonçalo Silva2010-06-171-25/+0
| | | | patches). RubyProf can handle it
* check if the data method is defined (meaning it's correctly patched)Gonçalo Silva2010-06-171-4/+4
|
* the official profiler (present in 1.9) should have the highest priorityGonçalo Silva2010-06-171-31/+31
|
* don't set cpu_frequency if RubyProf resolved itGonçalo Silva2010-06-171-2/+2
|