Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Instead of removing the instance variable just set it to nil, resolves the ↵ | Brian Cardarella | 2011-07-29 | 1 | -2/+2 |
| | | | | warnings because of a missing instance variable | ||||
* | Merge pull request #2327 from cesario/patch-1 | José Valim | 2011-07-28 | 1 | -1/+0 |
|\ | | | | | We don't need to require erb here. | ||||
| * | We don't need to require erb here. | Franck Verrot | 2011-07-28 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #2330 from thedarkone/resources-router-fix | José Valim | 2011-07-28 | 2 | -8/+16 |
|\ \ | |/ |/| | Inline resources router fix | ||||
| * | Make use of the inherited initializer. | thedarkone | 2011-07-28 | 1 | -3/+2 |
| | | |||||
| * | There is no need to be destructive with the passed-in options. | thedarkone | 2011-07-28 | 2 | -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é Valim | 2011-07-28 | 1 | -11/+17 |
| | | | | | | | | as keys. | ||||
* | | Rename class method to_path to _to_path and make it explicit that it is an ↵ | José Valim | 2011-07-28 | 1 | -2/+2 |
| | | | | | | | | internal method. | ||||
* | | Merge pull request #2034 from Casecommons/to_path | José Valim | 2011-07-28 | 4 | -23/+69 |
|\ \ | | | | | | | Allow ActiveModel-compatible instances to define their own partial paths | ||||
| * | | Let ActiveModel instances define partial paths. | Grant Hutchins & Peter Jaros | 2011-07-25 | 4 | -23/+69 |
| | | | | | | | | | | | | | | | | | | Deprecate ActiveModel::Name#partial_path. Now you should call #to_path directly on ActiveModel instances. | ||||
* | | | Make Rails.application.assets available in initializers | Joshua Peek | 2011-07-27 | 1 | -44/+36 |
| | | | |||||
* | | | contrib app minor tweak | Xavier Noria | 2011-07-27 | 1 | -2/+2 |
| | | | |||||
* | | | Improve performance and memory usage for options_for_select with Ruby 1.8.7 | Christos Zisopoulos | 2011-07-27 | 1 | -2/+2 |
| | | | |||||
* | | | simplify conditionals by assuming hash values will never be `false` | Aaron Patterson | 2011-07-26 | 1 | -10/+2 |
| | | | |||||
* | | | use regular ruby rather than clever ruby | Aaron Patterson | 2011-07-26 | 1 | -3/+3 |
| | | | |||||
* | | | fixing wildcard path matching when wildcard is inside parenthesis | Aaron Patterson | 2011-07-26 | 2 | -1/+8 |
| | | | |||||
* | | | Remove blank line | Santiago Pastorino | 2011-07-26 | 1 | -1/+0 |
| | | | |||||
* | | | Merge pull request #2273 from thoefer/refactor | Santiago Pastorino | 2011-07-26 | 1 | -5/+4 |
|\ \ \ | | | | | | | | | refactored 'assert_redirected_to' | ||||
| * | | | refactored 'assert_redirected_to': local call to validate_request! will be ↵ | thoefer | 2011-07-26 | 1 | -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-2094 | Aaron Patterson | 2011-07-26 | 2 | -1/+18 |
|\ \ \ \ | | | | | | | | | | | Fixes overriding of options[:html][:remote] in form_for() (Issue #2094) | ||||
| * | | | | added test case for fix to issue #2094 | Dan Gebhardt | 2011-07-16 | 1 | -0/+17 |
| | | | | | |||||
| * | | | | fixed problem in which options[:html][:remote] would be overridden in ↵ | Dan Gebhardt | 2011-07-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | form_for() - fixes #2094 | ||||
* | | | | | use sprocket's append_path and assert_match | Damien Mathieu | 2011-07-26 | 1 | -26/+26 |
| |/ / / |/| | | | |||||
* | | | | use_sprockets is not used anymore | Santiago Pastorino | 2011-07-26 | 1 | -5/+1 |
| | | | | |||||
* | | | | Bump sprockets up | Santiago Pastorino | 2011-07-26 | 1 | -1/+1 |
| | | | | |||||
* | | | | Bump rack up. Closes #2107 | Santiago Pastorino | 2011-07-25 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #2262 from sferik/format_true | José Valim | 2011-07-25 | 2 | -0/+9 |
|\ \ \ \ | | | | | | | | | | | Allow a route to have :format => true | ||||
| * | | | | Allow a route to have :format => true | Erik Michaels-Ober | 2011-07-25 | 2 | -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 config | Santiago Pastorino | 2011-07-25 | 2 | -8/+1 |
|/ / / | |||||
* | | | Merge pull request #2245 from ↵ | Santiago Pastorino | 2011-07-25 | 2 | -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 route | Dave Rogers | 2011-07-25 | 2 | -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 call | Aaron Patterson | 2011-07-25 | 1 | -10/+9 |
| | | | |||||
* | | | Merge pull request #2258 from thedarkone/no-file-stat | José Valim | 2011-07-25 | 2 | -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. | thedarkone | 2011-07-25 | 2 | -3/+3 |
| |/ / | |||||
* / / | Make polymorphic_url calls go through application helpers again. | thedarkone | 2011-07-25 | 3 | -9/+14 |
|/ / | | | | | | | This brings back the ability to overwrite/extend url generating methods in application heleprs. | ||||
* | | Merge pull request #2243 from dmathieu/comment | Xavier Noria | 2011-07-24 | 1 | -0/+1 |
|\ \ | | | | | | | Help the next guy with explanations - See bb3b3e306 | ||||
| * | | help the next guy with explanations - See bb3b3e306 | Damien Mathieu | 2011-07-24 | 1 | -0/+1 |
| | | | |||||
* | | | Use top level Rails constant | Andrew White | 2011-07-24 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-24 | 7 | -11/+11 |
|\ \ \ | |/ / |/| | | |||||
| * | | Missed a few instances of British English spelling in the last commit | Oemuer Oezkir | 2011-07-24 | 3 | -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 Oezkir | 2011-07-24 | 6 | -10/+10 |
| | | | | | | | | | | | | | | | | | | English to American English(according to Weber) | ||||
| * | | now the documentation reflects the actual returned value for a missing ↵ | gnagno | 2011-07-23 | 1 | -1/+1 |
| | | | | | | | | | | | | translation | ||||
* | | | Merge pull request #2233 from gramos/fix-issue-1951-master | Aaron Patterson | 2011-07-23 | 2 | -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 Ramos | 2011-07-24 | 2 | -3/+17 |
| | | | | | | | | | | | | | | | | fix issues/1951 | ||||
| * | | | - added test case for issue: | Gaston Ramos | 2011-07-24 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/issues/1951 Namespaced model partial_path is wrong in namespaced controllers | ||||
* | | | | just use normal ruby for stubbing | Aaron Patterson | 2011-07-23 | 1 | -5/+3 |
|/ / / | |||||
* | | | Merge pull request #2228 from Empact/helper_tags_in_mailers | Aaron Patterson | 2011-07-23 | 2 | -1/+2 |
|\ \ \ | | | | | | | | | Simple fix to the NoMethodError noted in #2177. | ||||
| * | | | Simple fix to the NoMethodError noted in #2177. | Ben Woosley | 2011-07-23 | 2 | -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 #2199 | Damien Mathieu | 2011-07-24 | 1 | -0/+1 |
|/ / / | |||||
* / / | checked all .rb files in the project tree for missing magic comments, one ↵ | Xavier Noria | 2011-07-23 | 1 | -0/+2 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | was missing Came with this one-liner for this: find . -name '*.rb' | \ xargs chardet | \ grep -v ascii | \ cut -d: -f1 -s | \ xargs -n1 ruby -0777 -ne 'puts $FILENAME if $_ !~ /#.*coding:\s*utf/i' Welcome $_. |