aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-10-0845-58/+450
|\
| * Fix warning spew for 1.9Carl Lerche2009-10-081-1/+5
| |
| * Fix for Ruby 1.9 - define_method throws an exception under 1.9 if given ↵Chad Woolley2009-10-081-1/+1
| | | | | | | | | | | | incorrect number of args Signed-off-by: Carl Lerche <carllerche@mac.com>
| * Ruby 1.9: Fix ActiveResource::ConnectionError#to_s when @response does not ↵Chad Woolley2009-10-082-2/+5
| | | | | | | | | | | | respond to #code or #message Signed-off-by: Carl Lerche <carllerche@mac.com>
| * Don't need h in there now that XSS protection is on by defaultMichael Koziarski2009-10-082-2/+2
| |
| * Use indifferent access attributes instead of stringifying themPratik Naik2009-10-082-2/+10
| |
| * error procs have to be safe tooMichael Koziarski2009-10-081-1/+1
| |
| * Allow accepts_nested_attributes_for :reject_if option accept symbols for ↵Pratik Naik2009-10-073-6/+57
| | | | | | | | | | | | | | | | using a method Conflicts: activerecord/lib/active_record/nested_attributes.rb
| * Switch to on-by-default XSS escaping for rails.Michael Koziarski2009-10-0836-42/+368
| | | | | | | | | | | | | | | | | | | | | | | | This consists of: * String#html_safe! a method to mark a string as 'safe' * ActionView::SafeBuffer a string subclass which escapes anything unsafe which is concatenated to it * Calls to String#html_safe! throughout the rails helpers * a 'raw' helper which lets you concatenate trusted HTML from non-safety-aware sources (e.g. presantized strings in the DB) * New ERB implementation based on erubis which uses a SafeBuffer instead of a String Hat tip to Django for the inspiration.
| * Do not ignore .empty_directory files.José Valim2009-10-071-1/+1
| | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com>
* | Updated ARel commit version.Emilio Tagua2009-10-081-5/+5
| |
* | Relations: Added offset when finding with associations. Delegate array instanceEmilio Tagua2009-10-072-10/+7
| | | | | | | | methods to to_a.
* | Merge commit 'rails/master'Emilio Tagua2009-10-077-111/+134
|\|
| * Rewrite ActiveModel::Lint as a simple TU mixinJoshua Peek2009-10-072-80/+38
| |
| * Fixed behavior of attribute_methods_generated? [#3220 state:resolved]Sam Pohlenz2009-10-072-1/+27
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Don't share attribute matchers between classes [#3216 state:resolved]Sam Pohlenz2009-10-072-1/+24
| | | | | | | | | | | | | | Allows separate models that include ActiveModel::AttributeMethods to use different sets of attribute matchers. Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Not calling a private method anymoreYehuda Katz2009-10-071-2/+5
| |
| * Fix warning spewYehuda Katz2009-10-061-1/+3
| |
| * Call initialize_copy when cloning [#3164 state:resolved]Paul Gillard2009-10-062-28/+39
| | | | | | | | | | | | | | | | Cloned AR objects are now instantiated through initialize_copy rather than new/initialize. This allows AR classes to override initialize_copy in order to implement deep cloning. Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | Don't send table_name when updating attributes, use the class arel_table.Emilio Tagua2009-10-071-1/+1
| |
* | Don't send table_name when there's no need to.Emilio Tagua2009-10-071-1/+1
| |
* | Allow preload and eager_load to work on relations at the same time.Emilio Tagua2009-10-072-6/+30
| |
* | Merge commit 'rails/master'Emilio Tagua2009-10-068-1/+79
|\|
| * don't ignore all bin directoriesMichael Koziarski2009-10-061-1/+0
| |
| * MessageVerifier#verify raises InvalidSignature if the signature is blankJeffrey Hardy2009-10-052-0/+7
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Coerce all out going body parts to StringsJoshua Peek2009-10-055-0/+72
| |
* | Merge commit 'rails/master'Emilio Tagua2009-10-0515-809/+64
|\|
| * Yank FCGI Handler from coreJoshua Peek2009-10-059-781/+0
| | | | | | http://github.com/rails/fcgi_handler
| * Rewrite FCGI handler testJoshua Peek2009-10-053-34/+46
| |
| * Try to load lib before trying to activate the gem for testingJoshua Peek2009-10-051-2/+6
| |
| * Put test in place for deprecated dispatcherJoshua Peek2009-10-051-0/+7
| |
| * More robust console testJoshua Peek2009-10-053-43/+56
| |
| * Revert "Revert "Fix Dispatch.new so passenger works" as it broke the build"Joshua Peek2009-10-051-1/+1
| | | | | | | | This reverts commit 49b52cadc2e66c11a025e7719837ae77b3736046.
* | Initial documentation to Base#all.Emilio Tagua2009-10-051-2/+2
| |
* | Merge branch 'associations_2'Emilio Tagua2009-10-056-13/+90
|\ \
| * | Added eager loading support to Relation and ActiveRecord#all.Emilio Tagua2009-10-054-21/+34
| | |
| * | Moved relation's test to relation_test.Emilio Tagua2009-10-054-9/+19
| | |
| * | Added association preload to relation.Emilio Tagua2009-09-013-4/+58
| | |
* | | Merge commit 'rails/master'Emilio Tagua2009-10-0550-395/+396
|\ \ \ | | |/ | |/|
| * | Revert "Fix Dispatch.new so passenger works" as it broke the buildMichael Koziarski2009-10-051-1/+1
| | | | | | | | | | | | This reverts commit c97c31b096e627480b64403d1460065738941c3e.
| * | Fix Dispatch.new so passenger worksJoshua Peek2009-10-041-1/+1
| | |
| * | Only draw default route onceJoshua Peek2009-10-031-22/+37
| | |
| * | Use with_routing helper in tests instead of modifying global route setJoshua Peek2009-10-034-101/+125
| | |
| * | Redraw default routes on all internal integration tests. We don't need ↵Joshua Peek2009-10-0315-41/+34
| | | | | | | | | | | | SimpleRouteCase anymore
| * | Avoid creating new controller constants during test runtime. All routable ↵Joshua Peek2009-10-032-68/+21
| | | | | | | | | | | | controllers should be defined beforehand.
| * | Run AP isolated tests on CIJoshua Peek2009-10-031-0/+1
| | |
| * | Moved shared form helper models into fake_modelsJoshua Peek2009-10-033-99/+98
| | |
| * | NumberHelper depends on big decimal extensionsJoshua Peek2009-10-031-0/+1
| | |
| * | Changing directories during the test breaks file loading when ran by itselfJoshua Peek2009-10-032-32/+22
| | |
| * | Don't load rubygems for isolated testsJoshua Peek2009-10-031-2/+3
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-17 19:42:29 +0000