aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* adds minus to value part of id [#4862 state:resolved]RainerBlessing2010-06-221-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* test for #4862Neeraj Singh2010-06-221-0/+5
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Avoid method redefined warningSantiago Pastorino2010-06-221-1/+2
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Add support for specifying locals in view tests with assert template [#4927 ↵David Chelimsky2010-06-223-5/+44
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Ensure overwritten callbacks conditions in controllers work [#4761 ↵José Valim2010-06-221-2/+12
| | | | state:resolved] [#3913 state:resolved]
* Bump rack-mount to 0.6.5 for tokenizer speedupJeremy Kemper2010-06-212-2/+2
|
* removed default Formatter in logger, not needed with 1.8.7 upwardsJosh Kalderimis2010-06-221-38/+0
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* removed 'unless const_defined?' code smellJosh Kalderimis2010-06-218-196/+186
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Refactor previous commit a bit [#4057 state:resolved]José Valim2010-06-217-16/+16
|
* Make ActiveModel::Errors#add_on_blank and #add_on_empty accept an options ↵Jeroen van Dijk2010-06-2115-441/+315
| | | | | | | | | | | | | | | | hash and make various Validators pass their (filtered) options. This makes it possible to pass additional options through Validators to message generation. E.g. plugin authors want to add validates_presence_of :foo, :format => "some format". Also, cleanup the :default vs :message options confusion in ActiveModel validation message generation. Also, deprecate ActiveModel::Errors#add_on_blank(attributes, custom_message) in favor of ActiveModel::Errors#add_on_blank(attributes, options). Also, refactoring of ActiveModel and ActiveRecord Validation tests. Test are a lot more DRY now. Better test coverage as well now. The first four points were reapplied from an older patch of Sven Fuchs which didn't apply cleanly anymore and was not complete yet. Signed-off-by: José Valim <jose.valim@gmail.com>
* Changed `ruby /path/to/rails myapp --dev` to `ruby /path/to/rails new myapp ↵Jeff Kreeftmeijer2010-06-211-1/+1
| | | | | | --dev` in the "Thor is not avalable" message. [#4915 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Initialize @last_update_at in file_update_checker to hide warnings in AS ↵rohit2010-06-211-2/+2
| | | | | | test suite. Signed-off-by: José Valim <jose.valim@gmail.com>
* Revert "files in the lib directory are no longer autoloaded"Xavier Noria2010-06-212-8/+2
| | | | | | | This patch is not consistent since it leaves similar directories in load_paths, needs more thought. This reverts commit b5fe014fdcc285f3bcb8779c4f7cfbc5a820856f.
* Don't waste time building relations if there are no values presents. [#4860 ↵Emilio Tagua2010-06-211-4/+4
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Allow instrumentation of cache hits and misses. [#4888 state:resolved]Hongli Lai (Phusion)2010-06-211-25/+40
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Alias app to build_middleware_stack for clarity.José Valim2010-06-212-1/+2
|
* Remove unused webrick_server file.José Valim2010-06-211-156/+0
|
* files in the lib directory are no longer autoloadedXavier Noria2010-06-212-2/+8
| | | | | | | | | | | Conceptually, the lib directory is closer 3rd party libraries than to the application itself. Thus, Rails adds it to Ruby's load path ($LOAD_PATH, $:) but it is no longer included in dependencies' load paths. To enable autoloading back put this in your config/application.rb config.load_paths += %W( #{config.root}/lib )
* adds parens to silence a warning in the test suite of ASXavier Noria2010-06-201-1/+1
|
* Merge remote branch 'rails/master'Xavier Noria2010-06-20117-954/+1885
|\ | | | | | | | | Conflicts: actionpack/lib/abstract_controller/base.rb
| * Update ActiveSupport CHANGELOG with latest changes.José Valim2010-06-201-0/+4
| |
| * I18n.reload! is only called if any of the locale files actually changed.José Valim2010-06-205-179/+196
| |
| * Use the new ActiveSupport::FileUpdateChecker instead of RoutesReloader.José Valim2010-06-203-50/+11
| |
| * Add ActiveSupport::FileUpdateChecker.José Valim2010-06-203-1/+96
| |
| * Improve documentation for add_lib_to_load_paths!José Valim2010-06-201-3/+16
| |
| * 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>