| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote branch 'rails/master' | Xavier Noria | 2010-06-20 | 117 | -954/+1885 |
| |\ | | | | | | | | | Conflicts: actionpack/lib/abstract_controller/base.rb | ||||
| | * | Update ActiveSupport CHANGELOG with latest changes. | José Valim | 2010-06-20 | 1 | -0/+4 |
| | | | |||||
| | * | I18n.reload! is only called if any of the locale files actually changed. | José Valim | 2010-06-20 | 5 | -179/+196 |
| | | | |||||
| | * | Use the new ActiveSupport::FileUpdateChecker instead of RoutesReloader. | José Valim | 2010-06-20 | 3 | -50/+11 |
| | | | |||||
| | * | Add ActiveSupport::FileUpdateChecker. | José Valim | 2010-06-20 | 3 | -1/+96 |
| | | | |||||
| | * | Improve documentation for add_lib_to_load_paths! | José Valim | 2010-06-20 | 1 | -3/+16 |
| | | | |||||
| | * | Fixed date_select date_separator when discard_month and/or discard_day are ↵ | Thibaud Guillaume-Gentil | 2010-06-20 | 2 | -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. ↵ | rohit | 2010-06-20 | 1 | -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 created | Steve Abatangle | 2010-06-20 | 1 | -4/+8 |
| | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | Adding missing test to autolink with other protocols (file) [#4886 ↵ | Carlos Antonio da Silva | 2010-06-20 | 1 | -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 Poorter | 2010-06-20 | 3 | -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 Duryea | 2010-06-20 | 1 | -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 file | Ryan Duryea | 2010-06-20 | 1 | -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ás | 2010-06-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | [#4727 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | Adds titleize/titlecase to AS::Multibyte::Chars | Norman Clarke | 2010-06-20 | 2 | -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 ↵ | rohit | 2010-06-20 | 17 | -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 Tagua | 2010-06-20 | 1 | -46/+46 |
| | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | <=> is defined twice on multibyte/chars.rb for Ruby < 1.9 | Sam Elliott and Santiago Pastorino | 2010-06-20 | 1 | -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 Cuirot | 2010-06-20 | 3 | -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 Griego | 2010-06-20 | 5 | -8/+8 |
| | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | 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 |
| | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |