aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | no need for an anonymous class on every setup callAaron Patterson2011-07-251-10/+9
| | |
* | | Merge pull request #2258 from thedarkone/no-file-statJosé Valim2011-07-252-3/+3
|\ \ \ | | | | | | | | Use shorter class-level File methods instead of going through File.stat
| * | | Use shorter class-level File methods instead of going through File.stat.thedarkone2011-07-252-3/+3
| |/ /
* / / Make polymorphic_url calls go through application helpers again.thedarkone2011-07-253-9/+14
|/ / | | | | | | This brings back the ability to overwrite/extend url generating methods in application heleprs.
* | Merge pull request #2243 from dmathieu/commentXavier Noria2011-07-241-0/+1
|\ \ | | | | | | Help the next guy with explanations - See bb3b3e306
| * | help the next guy with explanations - See bb3b3e306Damien Mathieu2011-07-241-0/+1
| | |
* | | Use top level Rails constantAndrew White2011-07-241-2/+2
| | |
* | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-247-11/+11
|\ \ \ | |/ / |/| |
| * | Missed a few instances of British English spelling in the last commitOemuer Oezkir2011-07-243-3/+3
| | | | | | | | | | | | oh and obviously I meant according to Webster, not Weber
| * | Changed a few instances of of words in the API docs written in British ↵Oemuer Oezkir2011-07-246-10/+10
| | | | | | | | | | | | | | | | | | English to American English(according to Weber)
| * | now the documentation reflects the actual returned value for a missing ↵gnagno2011-07-231-1/+1
| | | | | | | | | | | | translation
* | | Merge pull request #2233 from gramos/fix-issue-1951-masterAaron Patterson2011-07-232-2/+30
|\ \ \ | | | | | | | | Fix issue 1951 master Namespaced model partial_path is wrong in namespaced controllers
| * | | - added ActionView::PartialRenderer#merge_path_into_partial(path, partial)Gaston Ramos2011-07-242-3/+17
| | | | | | | | | | | | | | | | fix issues/1951
| * | | - added test case for issue:Gaston Ramos2011-07-241-0/+14
| | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/issues/1951 Namespaced model partial_path is wrong in namespaced controllers
* | | | just use normal ruby for stubbingAaron Patterson2011-07-231-5/+3
|/ / /
* | | Merge pull request #2228 from Empact/helper_tags_in_mailersAaron Patterson2011-07-232-1/+2
|\ \ \ | | | | | | | | Simple fix to the NoMethodError noted in #2177.
| * | | Simple fix to the NoMethodError noted in #2177.Ben Woosley2011-07-232-1/+2
| | | | | | | | | | | | Unfortunately #respond_to?(:controller) won't work as suggested, nor will respond_to?(:params), as #controller is present and #params is delegated to #controller. #delegate makes respond_to? return true regardless whether the target responds to it.
* | | | rake assets:precompile should always perform caching - Closes #2199Damien Mathieu2011-07-241-0/+1
|/ / /