aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | fix rendering a partial with an array as its :object [#5746 state:resolved]Michael Koziarski2010-10-083-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> Conflicts: actionpack/lib/action_view/render/partials.rb
| * | Allow cache to be temporarily disabled through lookup_context.José Valim2010-10-075-6/+53
| | |
| * | render :template => 'foo/bar.json' now works as it should.José Valim2010-10-076-15/+57
| | |
| * | Make collection rendering faster.José Valim2010-10-072-3/+3
| | |
| * | Remove locals dependency from template.José Valim2010-10-079-85/+130
| | | | | | | | | | | | | | | | | | This means that templates does not need to store its source anymore, allowing us to reduce the ammount of memory taken by our Rails processes. Naively speaking, if your app/views contains 2MB of files, each of your processes (after being hit by a bunch of requests) will take 2MB less of memory after this commit. This is extremely important for the upcoming features. Since Rails will also render CSS and JS files, their source won't be stored as well allowing us to decrease the ammount of memory taken.
| * | Add a TODO to remove gem "jruby-openssl" when jruby-openssl is merge in jrubySantiago Pastorino2010-10-071-0/+3
| | | | | | | | | | | | [#5762]
| * | - update documentationGaston Ramos2010-10-071-0/+9
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * | - ActiveResource::HttpMock.respond_toGaston Ramos2010-10-071-1/+14
| | | | | | | | | | | | | | | | | | | | | do not replace the response with the same path but different method - Fix typo Signed-off-by: José Valim <jose.valim@gmail.com>
| * | - Fix ActiveResource::HttpMock.respond_to replace the responseGaston Ramos2010-10-072-23/+47
| | | | | | | | | | | | | | | | | | if it has the same request Signed-off-by: José Valim <jose.valim@gmail.com>
| * | Get rid of ruby warnings in Resolvers. Move a few methods up to the abstract ↵José Valim2010-10-072-23/+26
| | | | | | | | | | | | class.
| * | Add jruby-openssl gem in Gemfile necessary for JRubyAnil Wadghule2010-10-071-0/+2
| | | | | | | | | | | | | | | | | | [#5762 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | Add "a" to make it better EnglishRyan Bigg2010-10-072-2/+2
| |/ | | | | | | | | | | [#3796 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-10-068-23/+22
| |\
| | * Fixed typo in engine documentationThomas McDonald2010-10-061-1/+1
| | |
| | * `render :text => proc { ... }` is no longer supported.John Firebaugh2010-10-041-4/+0
| | |
| | * Template::Error is also used if rendering fails.John Firebaugh2010-10-041-2/+3
| | |
| | * Merge branch 'master' of github.com:lifo/docrailsNicholas E. May (on Enterprise)2010-10-031-2/+2
| | |\
| | | * Correct documentation that references how *_filter of action_pack are ↵Marcelo Giorgi2010-10-031-2/+2
| | | | | | | | | | | | | | | | translated into set_callback/run_callback's (from active_support) invocations.
| | * | Section 6, table, typo (extra '.rb')Nicholas E. May (on Enterprise)2010-10-031-1/+1
| | | |
| | * | Section 4.3, wrong word used: 'contact' => 'content'Nicholas E. May (on Enterprise)2010-10-021-1/+1
| | | |
| | * | Section 3.3: '# bundle install' instead of just 'bundle install'Nicholas E. May (on Enterprise)2010-10-021-1/+1
| | | |
| | * | Section 3.2, table: 'README.rdoc' -> 'README'Nicholas E. May (on Enterprise)2010-10-021-1/+1
| | |/
| | * Removed unnecessary 'the' in the '2.2.9 Active Suport' section of Getting ↵Nicholas E. May (on Enterprise)2010-10-021-1/+1
| | | | | | | | | | | | Started.
| | * Fix syntax error in ActiveModel::Validations .validate examplefastred2010-10-011-1/+1
| | |
| | * Fix serialization :include option nameEvgeniy Dolzhenko2010-10-011-1/+1
| | |
| | * Action Mailer Basics guide - reformatted configuration tableJaime Iniesta2010-09-301-4/+4
| | |
| | * Action Mailer Basics guide - fixed typosJaime Iniesta2010-09-301-4/+6
| | |
| * | fix ruby 1.9 deadlock problem, fixes #5736 add connection pool testsHemant Kumar2010-10-062-8/+35
| | |
| * | Fixes typoRafael Mendonça França2010-10-061-2/+2
| | |
| * | Provide a cleaner syntax for paths configuration that does not rely on ↵José Valim2010-10-0621-270/+359
| | | | | | | | | | | | method_missing.
* | | Add ↵Jon Leighton2010-10-133-4/+41
| | | | | | | | | | | | test_has_many_through_has_and_belongs_to_many_with_has_many_source_reflection and make it work
* | | Refactoring ThroughAssociationScope#construct_through_joinsJon Leighton2010-10-131-54/+62
| | |
* | | First bit of support for habtm in through assocs - ↵Jon Leighton2010-10-136-30/+84
| | | | | | | | | | | | test_has_many_through_has_many_with_has_and_belongs_to_many_source_reflection now passes
* | | Hook ThroughAssociationScope up to use the AliasTracker classJon Leighton2010-10-131-9/+30
| | |
* | | Some small tweaks on the last commitJon Leighton2010-10-122-19/+12
| | |
* | | Extract aliasing code from JoinDependency and JoinAssociation into a ↵Jon Leighton2010-10-122-41/+83
| | | | | | | | | | | | separate AliasTracker class. This can then be used by ThroughAssociationScope as well.
* | | Add a commented, failing test for using a habtm in a has many through ↵Jon Leighton2010-10-125-55/+74
| | | | | | | | | | | | association. I want to refactor how aliasing works first.
* | | Add test_has_many_through_has_one_through_with_has_many_source_reflectionJon Leighton2010-10-122-1/+19
| | |
* | | Adding test_has_many_through_has_one_with_has_many_through_source_reflection ↵Jon Leighton2010-10-125-3/+29
| | | | | | | | | | | | and modifying ThroughAssociationScope to make it work correctly.
* | | Rename some tests for consistencyJon Leighton2010-10-121-3/+3
| | |
* | | Add test_has_many_through_has_one_throughJon Leighton2010-10-122-2/+17
| | |
* | | Support has_one through assocs as the source associationJon Leighton2010-10-127-20/+71
| | |
* | | A load of tests that need to be writtenJon Leighton2010-10-121-0/+63
| | |
* | | Refactoring to remove duplication introduced by the last commitJon Leighton2010-10-101-160/+145
| | |
* | | Add support for nested through associations in JoinAssociation. Hence ↵Jon Leighton2010-10-0911-94/+175
| | | | | | | | | | | | Foo.joins(:bar) will work for through associations. There is some duplicated code now, which will be refactored.
* | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-0690-1040/+990
|\| |
| * | Some initial docswycats2010-10-061-0/+7
| | |
| * | Delegate everything to the generatorwycats2010-10-061-14/+4
| | |
| * | Revert "Clean up the builder abstraction in AppGenerator."wycats2010-10-062-55/+260
| | | | | | | | | | | | | | | | | | | | | The phrase "clean up" misrepresents the fact that this removes a feature that ships with Rails 3.0. This reverts commit 6774e12afa0f29442aa612ddf6e51d5a1b7a4356.
| * | Clean up the builder abstraction in AppGenerator.José Valim2010-10-062-260/+55
| | | | | | | | | | | | This commit may be reverted once documentation and a proper way to handle actions are added.