aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add the :path option to match routes when given as symbols. This is ↵Carlos Antonio da Silva2010-06-232-10/+28
| | | | | | | | | | specially useful in http helpers for generating routes in scenarios like: resources :users, :path => 'usuarios' do get :search, :on => :collection, :path => 'pesquisar' end Signed-off-by: José Valim <jose.valim@gmail.com>
* Provive resources_path_names helpers in the router.José Valim2010-06-232-0/+15
|
* Stop filling the blocks scope array with nil.José Valim2010-06-221-1/+3
|
* Allow namespace accept options in routes [#4936 state:resolved]Carlos Antonio da Silva2010-06-222-3/+17
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Deprecate :name_prefix in the new router DSL.José Valim2010-06-223-23/+27
|
* Fix connection reloading in development mode. [#4929 state:resolved]Edgars Beigarts2010-06-222-3/+6
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* should be able to run ActiveModel validations_test [#4933 state:resolved]Neeraj Singh2010-06-221-0/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Avoid method redefined warningSantiago Pastorino2010-06-221-1/+4
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Note that 'rails server' allows specifying mongrel, thin, etc [#4845 ↵Trevor Turk2010-06-221-1/+1
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Fix small bug where ActiveRecord::PredicateBuilder#build_from_hash didn't ↵James Harton2010-06-221-1/+1
| | | | | | test for Arel::Relation as right hand value. [#4917 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* test for #4917Neeraj Singh2010-06-221-0/+7
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Remove unused variable on assert_recognizes [#4912 state:resolved]Paco Guzman2010-06-221-1/+0
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Missing require for the class/attribute.rb [4812 state:resolved]Prem Sichanugrist2010-06-221-0/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* update the list of instance variables that are excluded from assigns in view ↵David Chelimsky2010-06-221-9/+10
| | | | | | | | tests [#4930 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Clean CHANGELOG whitespace.Emilio Tagua2010-06-221-254/+254
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Fix order method to accept relation attributes.Emilio Tagua2010-06-222-3/+7
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Use the new query API in AR performance script.Emilio Tagua2010-06-221-3/+3
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* preventing memcached initialization errors with default servers list [#4921 ↵David Calavera2010-06-222-2/+2
| | | | | | | | state:resolved] As of this writing the JRuby client does not support a default port. Signed-off-by: Xavier Noria <fxn@hashref.com>
* defines ORIG_ARGV in Active Support's abstract_unit.rb (used in ↵David Calavera2010-06-221-0/+2
| | | | | | isolation.rb) [#4922 state:resolved] Signed-off-by: Xavier Noria <fxn@hashref.com>
* Rails Runner now sets $0 and $PROGRAM_NAME to name of file being run [#2244 ↵rohit2010-06-221-0/+1
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Added 4 tests for Rails Runner. 2 failing tests for $0 and $PROGRAM_NAME ↵rohit2010-06-221-0/+49
| | | | | | [#2244 state:open] Signed-off-by: José Valim <jose.valim@gmail.com>
* 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>