aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'master' of git://github.com/rails/rails into oldJosé Valim2009-08-074-14/+23
|\ \
| * | Get all ActionController partial rendering to use ActionView's partial code. ...Yehuda Katz2009-08-074-14/+23
* | | Merge branch 'master' of git://github.com/rails/rails into oldJosé Valim2009-08-0796-756/+1001
|\| |
| * | WhitespaceYehuda Katz2009-08-071-7/+7
| * | Continue reworking the partial path.Yehuda Katz2009-08-072-47/+22
| * | Modify various partial methods to carry along the block that can be passed in...Yehuda Katz2009-08-073-44/+54
| * | Some more AV work:Yehuda Katz2009-08-072-26/+25
| * | Replace _render_template_with_layout with _render_template since the layout i...Yehuda Katz2009-08-077-21/+29
| * | Some more AV refactoring:Yehuda Katz2009-08-072-15/+6
| * | Start cleaning up partial pathYehuda Katz2009-08-074-12/+20
| * | This is handled by the resolver nowYehuda Katz2009-08-071-24/+5
| * | Clean up render @object a bit more.Yehuda Katz2009-08-073-78/+19
| * | Improve a path in _render_partialYehuda Katz2009-08-062-24/+27
| * | Remove file that doesn't seem to be used anymoreYehuda Katz2009-08-061-84/+0
| * | Move AbstractController to a top-level componentYehuda Katz2009-08-0614-22/+19
| * | ActionController::Metal#to_rack converted to #to_a to match normal rack conve...Yehuda Katz2009-08-062-3/+3
| * | Update _render_options to reflect the fact that they're publicYehuda Katz2009-08-061-6/+6
| * | Rename /base to /metal and make base.rb and metal.rb top-level to reflect the...Yehuda Katz2009-08-0626-36/+36
| * | rename ActionController::Http to ActionController::Metal at Josh's suggestionYehuda Katz2009-08-066-12/+10
| * | Replace _action_view with view_context to reflect that it is public and that ...Yehuda Katz2009-08-066-11/+10
| * | replace _render_*_from_controller with render_* as they are intended to be pu...Yehuda Katz2009-08-065-9/+9
| |/
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-08-052-4/+4
| |\
| | * Use send instead of instance_evalPratik Naik2009-08-062-4/+4
| * | Ruby 1.9.2 compat: Array#* uses to_str instead of to_s to join values since R...Akira Matsuda2009-08-051-2/+1
| |/
| * Dont require thin as the thin rack adapter is now upstreamJames Tucker2009-08-051-7/+0
| * Allow validations to use values from custom readers [#2936 state:resolved]James Hill2009-08-055-4/+71
| * Make sure javascript_include_tag/stylesheet_link_tag does not append ".js" or...Matthew Rudy Jacobs2009-08-053-12/+22
| * Revert "fallback_string_to_date sets Date._parse comp arg to true, so that st...Geoff Buesing2009-08-053-9/+1
| * Extract generic attribute method generation to AMoJoshua Peek2009-08-049-299/+284
| * whitespaceJoshua Peek2009-08-041-5/+5
| * Added reset_attribute! method to ActiveRecord::AttributeMethods::Dirty which ...Paul Gillard2009-08-042-12/+39
| * Modified ActiveRecord::AttributeMethods to allow classes to specify attribute...Paul Gillard2009-08-045-56/+200
| * Add simple support for ActiveModel's StateMachine for ActiveRecordJoshua Peek2009-08-049-29/+122
| * fallback_string_to_date sets Date._parse comp arg to true, so that strings wi...Matt Ganderup2009-08-033-1/+9
| * quoted_date converts time-like objects to ActiveRecord::Base.default_timezone...Geoff Buesing2009-08-034-1/+127
| * Track generated attribute methods in a separate moduleJoshua Peek2009-08-024-35/+19
| * Remove legacy processing and content_lengthYehuda Katz2009-08-024-49/+12
| * Update cache_control to be a Hash of options that is used to build the header.Yehuda Katz2009-08-027-30/+29
| * Ruby 1.9: fix encoding for test_file_streamJeremy Kemper2009-08-011-1/+2
| * Ruby 1.9: fix Content-Length for multibyte send_data streamingSava Chankov2009-08-013-1/+17
| * Extract String#bytesize shimJeremy Kemper2009-08-013-3/+14
| * SQLite: drop support for 'dbfile' option in favor of 'database.'Jeremy Kemper2009-08-012-1/+2
* | Merge branch 'respond_with'José Valim2009-07-312-58/+187
|\ \ | |/ |/|
| * Added tests for nested resources.José Valim2009-07-311-12/+48
| * Allow respond_with to deal with http verb accordingly.José Valim2009-07-312-40/+136
| * Remove any resource logic from respond_to.José Valim2009-07-301-17/+14
* | Start separating primary key concernsJoshua Peek2009-07-304-65/+76
* | Make sure we use send for the default attribute method body because the suffi...Joshua Peek2009-07-301-1/+1
* | Make sure to reset defined methods after calling attribute_method_suffixJoshua Peek2009-07-301-9/+7
* | Move attribute_types_cached_by_default into attribute methods reading concernJoshua Peek2009-07-302-10/+11