aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make sure tests pass action name to Controller.action()Pratik Naik2009-05-301-1/+1
* Support Object#filter method for before/after filtersPratik Naik2009-05-301-0/+2
* AS::Concern redefines "include" to lazy include modules as dependenciesJoshua Peek2009-05-2921-31/+31
* AS::Concern includes InstanceMethods module if it existsJoshua Peek2009-05-294-12/+15
* Merge branch 'master' into active_modelJoshua Peek2009-05-29570-5763/+11404
|\
| * Ruby 1.9: ERB template encoding using a magic comment at the top of the fileJeremy Kemper2009-05-285-10/+22
| * Ruby 1.9: flushing the output buffer preserves its encodingJeremy Kemper2009-05-282-3/+21
| * Reinstate pending output buffer testsJeremy Kemper2009-05-281-28/+36
| * Ruby 1.9: use UTF-8 for default internal and external encodings.Jeremy Kemper2009-05-282-3/+9
| * Break up DependencyModule's dual function of providing a "depend_on" DSL and ...Joshua Peek2009-05-2852-89/+98
| * Revert "Revert "Whitespace!""Joshua Peek2009-05-2823-264/+270
| * Only save the session if we're actually writing to it [#2703 state:resolved]Johan Sörensen2009-05-283-1/+40
| * The FlashHash and friends causes a lot of needless session storing, when we k...Johan Sörensen2009-05-282-34/+43
| * Memoize cookies so that updates to cookies are available in the current reque...Olly Legg2009-05-282-1/+7
| * Fix script/server's default mount path [#2731 state:resolved]Joshua Peek2009-05-281-1/+1
| * Fix failing ActionCacheFilter tests due to around filter changes.Yehuda Katz + Carl Lerche2009-05-272-3/+3
| * Added support to new callbacks for around filter object that respond to :befo...Yehuda Katz + Carl Lerche2009-05-271-1/+5
| * Added support to new callbacks for around filter object that respond to :befo...Yehuda Katz + Carl Lerche2009-05-271-0/+5
| * Added a compatibility layer to get legacy filter tests to pass on new baseYehuda Katz + Carl Lerche2009-05-271-5/+27
| * Added hook point in new base #send_action which does the actual action method...Yehuda Katz + Carl Lerche2009-05-272-2/+4
| * Add the ability to prepend filters to new callbacksCarl Lerche2009-05-272-1/+12
| * Make the default 500 Internal Server Error page more friendly. Many people do...Hongli Lai (Phusion)2009-05-271-1/+4
| * ensure initialize_database_middleware doesn't use ActionController if action_...calavera2009-05-272-6/+23
| * Ensure Memcache local cache returns duplicated values [#2302 state:resolved]Joshua Peek2009-05-272-1/+10
| * Add % to RESERVED_PCHAR [#2574 state:resolved]Eduard Bondarenko2009-05-272-1/+6
| * ActionController::Flash::FlashHash.use now returns either the value correspon...Niels Ganser2009-05-272-6/+20
| * server command help inconsistency fix [#2685 state:resolved]anupom syam2009-05-271-5/+5
| * Fix failing CI test (broken in 2daac47 or e693f45): make test_multipart_with_...Chad Woolley2009-05-272-5/+6
| * Add an model_subclass generator.Fabien Jakimowicz2009-05-275-0/+71
| * Merge branch 'master' of git@github.com:rails/railsYehuda Katz2009-05-271-0/+0
| |\
| | * Rename tools/profile_requires -> tools/profile since we do both require and r...Jeremy Kemper2009-05-271-0/+0
| * | Reduce the cost of using ActionController::Http significantly by:Yehuda Katz2009-05-2711-28/+88
| |/
| * add a metal to minimal examples for comparisonJeremy Kemper2009-05-271-6/+11
| * Get all template tests passing on new baseCarl Lerche2009-05-263-4/+6
| * Got all the dispatch tests running on new baseCarl Lerche2009-05-264-11/+15
| * Add controller/integration_test.rb to the new base test runnerCarl Lerche2009-05-261-2/+1
| * Get controller/test_test.rb to pass on new baseCarl Lerche2009-05-262-3/+3
| * Add html-scanner to the new base set of autoloadsCarl Lerche2009-05-261-0/+2
| * Get controller/view_paths_test.rb to pass on new baseCarl Lerche2009-05-263-2/+19
| * In new base Rails2Compatibility, move @template assignment to right before th...Carl Lerche2009-05-261-6/+6
| * Remove a no-op from view path tests and removed a Symbol#to_procCarl Lerche2009-05-261-2/+2
| * Support Method callbacksPratik Naik2009-05-261-0/+8
| * Make Filter#filter work with around filtersPratik Naik2009-05-255-76/+93
| * Make cookie store tests pass with the new basePratik Naik2009-05-251-0/+3
| * Don't want Rack's Content-Type default header thoughJeremy Kemper2009-05-241-2/+3
| * Construct a single HeaderHash. Speed up assign_default_content_type_and_charsetJeremy Kemper2009-05-241-4/+10
| * Compare Base with HttpJeremy Kemper2009-05-241-13/+24
| * Speed up Request#formatsJeremy Kemper2009-05-231-6/+14
| * runner classJeremy Kemper2009-05-231-16/+24
| * test depends on html-scannerJeremy Kemper2009-05-231-0/+1