aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Set proper engine's asset directories when assets are served from engine.Piotr Sarnacki2010-12-151-0/+8
| | | | | | | | | When using stylesheet_link_tag(:all) or javascript_include_tag(:all), assets directories are searched for css or js files. When config.serve_static_assets is set to true, those files can be served directly from engine's directories. That's why assets paths should be set individually for controllers inside engine if we want to serve static assets with ActionDispatch::Static
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-12-111-5/+10
|\ | | | | | | | | Conflicts: activerecord/lib/active_record/transactions.rb
| * Action Controller Overview: Remove dead link to the API docs for filtersRyan Bigg2010-12-101-0/+1
| |
| * root method options are the same as the match methodRyan Bigg2010-12-101-0/+2
| |
| * root route should go at the *top* of the routes file, because it is the most ↵Ryan Bigg2010-12-091-1/+3
| | | | | | | | popular route and should be matched first
| * indent code samples for mount docRyan Bigg2010-12-091-3/+3
| |
| * mapper.rb: add "options" to make the default-to-namespace-name line read betterRyan Bigg2010-12-091-1/+1
| |
* | Ensure that while caching a page rails takes intoNeeraj Singh2010-12-092-7/+29
| | | | | | | | | | | | | | | | account the resolved mime type for the request [#6110 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Ensure resolvers backward compatibility.José Valim2010-12-093-6/+4
| |
* | Clean up asset_host and asset_path.José Valim2010-12-091-2/+2
| |
* | Properly check the arity for template handlers.José Valim2010-12-092-1/+6
| |
* | Check if the routes object really responds to define_mount_prefix.José Valim2010-12-092-1/+19
|/
* makes a pass to the action caching rdocXavier Noria2010-12-081-32/+41
|
* Add to documentation that action caching doesNeeraj Singh2010-12-061-0/+5
| | | | | | handle HTTP_ACCEPT attribute properly and might provide wrong result. Use params[:format] to avoid this issue.
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-12-055-15/+11
|\
| * Fix mime type doc typosCarlos Antonio da Silva2010-12-041-2/+2
| |
| * Rewording existing commentNeeraj Singh2010-11-301-4/+3
| |
| * Rewording existing commentNeeraj Singh2010-11-291-6/+3
| |
| * make it clear that recompilation happens only inNeeraj Singh2010-11-271-2/+2
| | | | | | | | development mode
| * Added a space before "do" keywordAkira Matsuda2010-11-281-1/+1
| |
* | Allow back passing :rescue_format => nil and test addedSantiago Pastorino2010-12-042-1/+6
| |
* | Use ||= hereSantiago Pastorino2010-12-041-1/+1
| |
* | Make TranslationHelper#translate use the :rescue_format option in I18n 0.5.0Sven Fuchs2010-12-047-36/+68
| | | | | | | | | | | | Don't catch exceptions here. Instead only declare that we want exceptions to be rescued as :html, but also let users configure reactions to exceptions in I18n. Signed-off-by: José Valim <jose.valim@gmail.com>
* | bump i18n gemSven Fuchs2010-12-041-1/+1
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Wrap everything in class << self.José Valim2010-12-031-42/+37
| |
* | Merge remote branch 'joshk/redirect_routing'José Valim2010-12-038-363/+573
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG actionpack/lib/action_controller/metal/mime_responds.rb Signed-off-by: José Valim <jose.valim@gmail.com>
| * | Added documentation explaining the new additional supported syntaxes for the ↵Josh Kalderimis2010-11-303-0/+48
| | | | | | | | | | | | routing redirect method, a small changelog note, and two extra tests for path interpolation when using the hash option syntax.
| * | The redirect routing method now allows for a hash of options which only ↵Josh Kalderimis2010-11-307-363/+525
| | | | | | | | | | | | changes the relevant parts of the url, or an object which responds to call can be supplied so common redirect rules can be easily reused. This commit includes a change where url generation from parts has been moved to AD::Http::URL as a class method.
| * | move the setting up of the mime collector into the collector on initJosh Kalderimis2010-11-261-3/+3
| | |
* | | Deprecate handler_class_for_extension as template handlers can be any Ruby ↵José Valim2010-12-013-3/+9
| | | | | | | | | | | | object, not necessarily a class.
* | | just use aliasAaron Patterson2010-11-301-3/+1
| | |
* | | Fix tests on 1.9.2.José Valim2010-11-284-19/+23
| | |
* | | trailing star mimes should respect the order in which mime types are defined.José Valim2010-11-282-20/+17
| | |
* | | Update CHANGELOG.José Valim2010-11-271-0/+2
| |/ |/|
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-11-273-29/+69
|\ \
| * | Add explicit statement that verify_authenticity_token can be turned off for ↵Ryan Bigg2010-11-271-3/+7
| | | | | | | | | | | | actions.
| * | Resolving LH #5986, cookies doc updatesAditya Sanghi2010-11-261-3/+10
| | |
| * | Add mention of nested resource to resources documentationRyan Bigg2010-11-241-0/+15
| | |
| * | Document the :path option for resources :postsRyan Bigg2010-11-241-0/+8
| | |
| * | Add :module option documentation for the resources methodRyan Bigg2010-11-241-0/+8
| | |
| * | Remove non-sensical first couple of lines for scope method documentationRyan Bigg2010-11-241-2/+0
| | |
| * | Paths in ActionDispatch::Scoping documentation should be for /admin/posts, ↵Ryan Bigg2010-11-241-14/+14
| | | | | | | | | | | | not /admin/photos
| * | Fix formatting issue with rake routes output for the namespace methodRyan Bigg2010-11-241-7/+7
| | |
* | | implicit self hereSantiago Pastorino2010-11-251-1/+1
| | |
* | | move the setting up of the mime collector into the collector on initJosh Kalderimis2010-11-251-3/+3
| |/ |/| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Dynamically generaeted helpers on collection should not clobber resources ↵José Valim2010-11-252-0/+13
| | | | | | | | url helper [#6028 state:resolved]
* | #:nodoc: internal methods.José Valim2010-11-251-31/+31
| |
* | Rakefiles are executables, and rake loads rake, not rakefile coderaggi2010-11-251-1/+1
| |
* | If a user wants json output then try best to render json output. In such ↵Neeraj Singh2010-11-243-1/+25
| | | | | | | | | | | | | | | | cases prefer kind_of(String) over respond_to?(to_str) [#5841 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | process text/* if it appears in the middle ofNeeraj Singh2010-11-252-1/+25
| | | | | | | | HTTP_ACCEPT parameter