aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge commit 'rails/master' into i18nSven Fuchs2008-08-252-11/+12
|\
| * Update translations for pluralization key change from 'other' to 'many'Jeremy Kemper2008-08-241-11/+11
| |
| * Ruby 1.9 compat: set source encodingJeremy Kemper2008-08-231-0/+1
| |
| * I18n: use :other instead of :many as default key for pluralization to better ↵Sven Fuchs2008-08-231-11/+11
| | | | | | | | | | | | conform w/ cldr pluralization rules Signed-off-by: Michael Koziarski <michael@koziarski.com>
* | I18n: add aliases #t and #l to TranslationHelper#translate and #localizeSven Fuchs2008-08-251-0/+2
| |
* | I18n: use :other instead of :many as default key for pluralization to better ↵Sven Fuchs2008-08-231-11/+11
|/ | | | conform w/ cldr pluralization rules
* Merge branch 'master' into i18nJeremy Kemper2008-08-223-1/+15
|\
| * Ensure :partial => @collection and :collection => @collection behaves same. ↵Ryan Bates2008-08-223-1/+15
| | | | | | | | | | | | [#884 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | Merge commit 'sven/i18n' into i18nJeremy Kemper2008-08-226-72/+132
|\ \ | |/ |/|
| * Merge branch 'master' into i18nSven Fuchs2008-08-2134-496/+789
| |\
| * | fixing actionpack yml translationsSven Fuchs2008-08-201-21/+23
| | |
| * | Changed locale file to yml for actionpack, but still brokenIain Hecker2008-08-203-90/+90
| | |
| * | Cleaned up ActiveRecord i18n scopingIain Hecker2008-08-143-26/+28
| | |
| * | switch to using I18n.load_translations instead of requiring plain ruby filesSven Fuchs2008-08-132-78/+79
| | |
| * | update i18n usage for pluralization hashes (api change)Sven Fuchs2008-08-102-12/+67
| | |
* | | Removed template_public? because it will always be true since the default ↵Joshua Peek2008-08-212-10/+1
| | | | | | | | | | | | template is never a partial
* | | Tidy up pick partial template logicJoshua Peek2008-08-211-18/+12
| | |
* | | Cleanup around partial renderingRyan Bates2008-08-216-90/+66
| | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | | update rack tests for default response content_type and charsetJeremy Kemper2008-08-211-3/+3
| | |
* | | deprecate Base#assign_default_content_type_and_charsetJeremy Kemper2008-08-211-0/+5
| | |
* | | Move default content type and charset from Base to Response. Handle charset ↵Jeremy Kemper2008-08-213-16/+50
| | | | | | | | | | | | = nil.
* | | Allow polymorphic_url helper to take url options. [#880 state:resolved]Tarmo Tänav2008-08-213-7/+33
| |/ |/| | | | | | | | | | | | | | | All *_polymorphic_url, *_polymorphic_path helpers can now accept an options hash which will be passed on to the named route making it possible to generate polymorphic routes with additional url parameters. Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | Allow overriding id for feed and entry with atom_feed_builder. [#485 ↵Darragh Curran2008-08-212-16/+45
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | Simplified and renamed CallbackChain union method to replace_or_append!Joshua Peek2008-08-211-1/+1
| |
* | Partial revert of 2681685 premature TypeArray abstractionJoshua Peek2008-08-211-1/+25
| |
* | Switched integration test runner to use Rack processor instead of CGIJoshua Peek2008-08-203-45/+35
| |
* | Improve test coverage for integration tests cookie headerJoshua Peek2008-08-201-1/+4
| |
* | Don't shadow query string methodJoshua Peek2008-08-191-1/+10
| |
* | Test coverage for integration testing with parametersJoshua Peek2008-08-191-0/+32
| |
* | Return nil instead of a space when passing an empty collection or nil to ↵Ryan Bates2008-08-195-6/+17
| | | | | | | | | | | | 'render :partial' [#791 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | Delegate xhr helper method to integration sessionJoshua Peek2008-08-192-2/+19
| |
* | Make AbstractRequest.if_modified_sense return nil if the header could not be ↵Jamis Buck2008-08-192-1/+3
| | | | | | | | parsed
* | hack around CGI session closeJoshua Peek2008-08-191-1/+5
| |
* | Consistently use the framework's configured logger and avoid reverting to ↵Joshua Peek2008-08-184-5/+6
| | | | | | | | RAILS_DEFAULT_LOGGER unless necessary.
* | pass yielded arguments to block for ActionView::Base#render with :layout ↵Ryan Bates2008-08-177-28/+74
| | | | | | | | | | | | [#847 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | More integration test coverageJoshua Peek2008-08-171-3/+29
| |
* | Use Response status accessor instead of the Status headerJoshua Peek2008-08-171-17/+17
| |
* | Merge RackProcess#normalize_headers logic into AbstractResponse#prepare!Joshua Peek2008-08-172-47/+75
| |
* | Use RackRequest as a mock instead of StubCGI into RequestTestJoshua Peek2008-08-171-14/+10
| |
* | Set cache control to require revalidation if cache freshness response ↵Jeremy Kemper2008-08-141-5/+14
| | | | | | | | headers are set. Don't set Content-Length header if 304 status.
* | Fix asset file paths with dangling queries in mtime checkJeremy Kemper2008-08-141-2/+6
| |
* | TestRequest#recycle! uses unmemoize_all to reset cached request method, ↵Jeremy Kemper2008-08-131-3/+3
| | | | | | | | accepts, etc.
* | Fix rendering partials at the top level [#795 state:resolved]Joshua Peek2008-08-134-1/+21
| |
* | Refactor Filter predicate methods to use inheritance. [#815 state:resolved]Josh Susser2008-08-131-3/+16
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | Set asset-cached file ctime and mtime to the max mtime of the combined ↵Jeremy Kemper2008-08-122-1/+7
| | | | | | | | files. Allows for consistent ETag generation without having a shared filesystem.
* | Merge branch 'conditional-get'Jeremy Kemper2008-08-1215-300/+323
|\ \ | |/ |/|
| * Update changelog for conditional GET utility methodsJeremy Kemper2008-08-121-2/+8
| |
| * Update tests for request memoizationJeremy Kemper2008-08-089-121/+146
| |
| * Don't shadow host methodJeremy Kemper2008-08-081-1/+1
| |
| * Simplifying usage of ETags and Last-Modified and conditional GET requestsJeremy Kemper2008-08-077-135/+169
| |