aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Initialize config.assets.version the same way it's done in SprocketsSantiago Pastorino2011-08-081-1/+1
|
* Merge pull request #2448 from igrigorik/masterJoshua Peek2011-08-083-1/+15
|\ | | | | Asset pipeline fixes: clear out tmp cache and use environment in digest generation
| * use assets.version in asset checksum to allow user to easily overrideIlya Grigorik2011-08-051-1/+1
| |
| * generate environment dependent asset digestsIlya Grigorik2011-08-042-0/+14
| | | | | | | | | | | | If two different environments are configured to use the pipeline, but one has an extra step (such as compression) then without taking the environment into account you may end up serving wrong assets
| * Clear out tmp/cache when assets:clean is invoked.Ilya Grigorik2011-08-041-1/+1
| | | | | | | | | | | | Otherwise, if bad data is cached in tmp/clear then the next invocation of assets:precompile (or a regular incoming request) will pickup files from tmp without regenerating them from source.
* | edit changelog to mention about x_sendfile_header default changeVijay Dev2011-08-291-0/+2
| |
* | x_sendfile_header now defaults to nil and production.rb env file doesn'tSantiago Pastorino2011-08-072-2/+2
|/ | | | | | | set a particular value for it. This allows servers to set it through X-Sendfile-Type, read https://github.com/rack/rack/blob/master/lib/rack/sendfile.rb for more info. Anyways you can force this value in your production.rb
* The trailing '/' isn't being picked up by Github anyway, and the link works ↵Rashmi Yadav2011-08-041-1/+1
| | | | as is.
* document meta methodVijay Dev2011-08-041-3/+3
|
* Merge pull request #2421 from pivotal-casebook/masterSantiago Pastorino2011-08-042-3/+3
|\ | | | | Simple_format should not edit it in place. (Fixes https://github.com/rails/rails/issues/1980)
| * ActionView::Helpers::TextHelper#simple_format should not change the text in ↵Casebook Developer2011-08-042-3/+3
| | | | | | | | place. Now it duplicates it.
* | Merge pull request #2356 from waynn/fix_symbolSantiago Pastorino2011-08-042-4/+28
|\ \ | |/ |/| fix stringify_keys destructive behavior for most FormTagHelper functions
| * fix stringify_keys destructive behavior for most FormTagHelper functionsWaynn Lue2011-08-032-4/+28
| | | | | | | | add four new tests to verify that the other three methods that called stringify_keys! are fixed. verified that the tests break in master without the code patch. Closes #2355
* | Fix the issue where default_url_options is being cached on test cases. ↵thoefer2011-08-013-0/+35
| | | | | | | | | | | | Closes #1872. Closes #2031. Signed-off-by: José Valim <jose.valim@gmail.com>
* | Rename new method to_path to to_partial_path to avoid conflicts with ↵José Valim2011-08-014-10/+10
| | | | | | | | File#to_path and similar.
* | Merge pull request #2379 from arunagw/extra_require_removalSantiago Pastorino2011-07-311-1/+0
|\ \ | | | | | | Removing extra requires from the test. Already loaded in abstract_unit.
| * | Removing extra requires from the test. Already loaded in abstract_unit.Arun Agrawal2011-07-311-1/+0
| |/
* / remove extra require for 'active_support/dependencies' as it is required in ↵Vishnu Atrai2011-07-311-1/+0
|/ | | | abstract_unit.rb
* remove redundant calls to stringify_keysWaynn Lue2011-07-291-2/+2
|
* Instead of removing the instance variable just set it to nil, resolves the ↵Brian Cardarella2011-07-291-2/+2
| | | | warnings because of a missing instance variable
* Merge pull request #2327 from cesario/patch-1José Valim2011-07-281-1/+0
|\ | | | | We don't need to require erb here.
| * We don't need to require erb here.Franck Verrot2011-07-281-1/+0
| |
* | Merge pull request #2330 from thedarkone/resources-router-fixJosé Valim2011-07-282-8/+16
|\ \ | |/ |/| Inline resources router fix
| * Make use of the inherited initializer.thedarkone2011-07-281-3/+2
| |
| * There is no need to be destructive with the passed-in options.thedarkone2011-07-282-6/+15
| | | | | | | | This fixes a bug that is caused by Resource/SingletonResource mangling resource options when using inline "multi"-resource declarations.
* | Move the cache to a nested hash which performs better than a hash with array ↵José Valim2011-07-281-11/+17
| | | | | | | | as keys.
* | Rename class method to_path to _to_path and make it explicit that it is an ↵José Valim2011-07-281-2/+2
| | | | | | | | internal method.
* | Merge pull request #2034 from Casecommons/to_pathJosé Valim2011-07-284-23/+69
|\ \ | | | | | | Allow ActiveModel-compatible instances to define their own partial paths
| * | Let ActiveModel instances define partial paths.Grant Hutchins & Peter Jaros2011-07-254-23/+69
| | | | | | | | | | | | | | | | | | Deprecate ActiveModel::Name#partial_path. Now you should call #to_path directly on ActiveModel instances.
* | | Make Rails.application.assets available in initializersJoshua Peek2011-07-271-44/+36
| | |
* | | contrib app minor tweakXavier Noria2011-07-271-2/+2
| | |
* | | Improve performance and memory usage for options_for_select with Ruby 1.8.7Christos Zisopoulos2011-07-271-2/+2
| | |
* | | simplify conditionals by assuming hash values will never be `false`Aaron Patterson2011-07-261-10/+2
| | |
* | | use regular ruby rather than clever rubyAaron Patterson2011-07-261-3/+3
| | |
* | | fixing wildcard path matching when wildcard is inside parenthesisAaron Patterson2011-07-262-1/+8
| | |
* | | Remove blank lineSantiago Pastorino2011-07-261-1/+0
| | |
* | | Merge pull request #2273 from thoefer/refactorSantiago Pastorino2011-07-261-5/+4
|\ \ \ | | | | | | | | refactored 'assert_redirected_to'
| * | | refactored 'assert_redirected_to': local call to validate_request! will be ↵thoefer2011-07-261-5/+4
| | | | | | | | | | | | | | | | called in assert_response already. changed names of local variables in order to recognize the semantics a bit easier.
* | | | Merge pull request #2095 from dgeb/issue-2094Aaron Patterson2011-07-262-1/+18
|\ \ \ \ | | | | | | | | | | Fixes overriding of options[:html][:remote] in form_for() (Issue #2094)
| * | | | added test case for fix to issue #2094Dan Gebhardt2011-07-161-0/+17
| | | | |
| * | | | fixed problem in which options[:html][:remote] would be overridden in ↵Dan Gebhardt2011-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | form_for() - fixes #2094
* | | | | use sprocket's append_path and assert_matchDamien Mathieu2011-07-261-26/+26
| |/ / / |/| | |
* | | | use_sprockets is not used anymoreSantiago Pastorino2011-07-261-5/+1
| | | |
* | | | Bump sprockets upSantiago Pastorino2011-07-261-1/+1
| | | |
* | | | Bump rack up. Closes #2107Santiago Pastorino2011-07-251-1/+1
| | | |
* | | | Merge pull request #2262 from sferik/format_trueJosé Valim2011-07-252-0/+9
|\ \ \ \ | | | | | | | | | | Allow a route to have :format => true
| * | | | Allow a route to have :format => trueErik Michaels-Ober2011-07-252-0/+9
| | |/ / | |/| | | | | | | | | | | | | | | | | | When format is true, it is mandatory (as opposed to :format => false). This is currently not possible with resource routes, which automatically make format optional by default.
* / | | Remove unused use_sprockets configSantiago Pastorino2011-07-252-8/+1
|/ / /
* | | Merge pull request #2245 from ↵Santiago Pastorino2011-07-252-6/+25
|\ \ \ | | | | | | | | | | | | | | | | davidtrogers/constraints_block_passed_to_following_routes_in_same_scope Memoizing @blocks & disposing of constraints options properly
| * | | Ensure the constraints block is only applied to the correct routeDave Rogers2011-07-252-6/+25
| | |/ | |/| | | | | | | | | | addresses issue #1907 - any routes that follow a route with a constraints block are inheriting the previous route's constraints.