Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2339 from dgeb/mailers-in-plugins | José Valim | 2011-07-29 | 2 | -0/+1 |
|\ | | | | | Ensure that app/mailers gets created in new plugins (#2287 brought into master) | ||||
| * | Include empty app/mailers directory in mountable and full plugins | Dan Gebhardt | 2011-07-29 | 2 | -0/+1 |
|/ | |||||
* | Tidy up | Santiago Pastorino | 2011-07-28 | 2 | -5/+4 |
| | |||||
* | 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. | ||||
* | | | Merge pull request #2329 from nertzy/master | Xavier Noria | 2011-07-28 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Give attribution to Peter Jaros for the patch we paired on | ||||
| * | | | Give attribution to Peter Jaros for the patch we paired on. | Grant Hutchins | 2011-07-28 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #2326 from castlerock/plugin_generator_fix | Santiago Pastorino | 2011-07-28 | 1 | -8/+8 |
|\ \ \ | |_|/ |/| | | pluging generator test fix | ||||
| * | | pluging generator test fix | Vishnu Atrai | 2011-07-28 | 1 | -8/+8 |
|/ / | |||||
* | | Tidy up a bit plugin new gemspec | Santiago Pastorino | 2011-07-28 | 1 | -7/+3 |
| | | |||||
* | | Merge pull request #2295 from dgeb/mo-better-plugins | Santiago Pastorino | 2011-07-28 | 4 | -13/+42 |
|\ \ | | | | | | | Improve dependency management and gemspec file for plugins | ||||
| * | | Moved dependencies from Gemfile to gemspec to eliminate redundant declarations. | Dan Gebhardt | 2011-07-28 | 2 | -7/+24 |
| | | | |||||
| * | | Extracted version from gemspec and placed it in its own file. This is ↵ | Dan Gebhardt | 2011-07-28 | 3 | -3/+11 |
| | | | | | | | | | | | | consistent with the approach taken by "bundle gem", and is expected by gems such as svenfuchs/gem-release which can be used to bump / tag versions of gems. | ||||
| * | | Expanded meta-data in gemspec to include author, email, etc.; Defaults ↵ | Dan Gebhardt | 2011-07-28 | 1 | -4/+8 |
| | | | | | | | | | | | | include "TODO" to prevent gems from being built without review. | ||||
* | | | Revert "Merge pull request #2309 from smasry/master" | Jon Leighton | 2011-07-28 | 2 | -6/+1 |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 9d396ee8195e31f646e0b89158ed96f4db4ab38f, reversing changes made to fa2bfd832c1d1e997d93c2269a485cc74782c86d. Reason: the change broke the build. | ||||
* | | | Update CHANGELOG. | José Valim | 2011-07-28 | 1 | -0/+2 |
| | | | |||||
* | | | 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 | 2 | -5/+7 |
| | | | | | | | | | | | | internal method. | ||||
* | | | Merge pull request #2034 from Casecommons/to_path | José Valim | 2011-07-28 | 10 | -33/+131 |
|\ \ \ | | | | | | | | | Allow ActiveModel-compatible instances to define their own partial paths | ||||
| * | | | Let ActiveModel instances define partial paths. | Grant Hutchins & Peter Jaros | 2011-07-25 | 10 | -33/+131 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | |||||
* | | | | Merge pull request #2309 from smasry/master | Aaron Patterson | 2011-07-27 | 2 | -1/+6 |
|\ \ \ \ | | | | | | | | | | | Unmangaling reverse_sql_order when function is used | ||||
| * | | | | Reverse order fix when using function for ActiveRecord::QueryMethods Fixes #1697 | Samer Masry | 2011-07-27 | 2 | -1/+6 |
|/ / / / | |||||
* | | | | Merge pull request #2305 from thedarkone/errors-include | Santiago Pastorino | 2011-07-27 | 2 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | Improve AM::Errors#include? | ||||
| * | | | | Handle the empty array correctly. | thedarkone | 2011-07-27 | 2 | -1/+2 |
| | |_|/ | |/| | | |||||
* | | | | Improve performance and memory usage for options_for_select with Ruby 1.8.7 | Christos Zisopoulos | 2011-07-27 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #1969 from ↵ | Jon Leighton | 2011-07-27 | 2 | -0/+8 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | dmitriy-kiriyenko/calculations_with_having_on_select ActiveRecord calculation fail when having contains conditions based on select values | ||||
| * | | | | Fixed failing query when performing calculation with having based on select. | Dmitriy Kiriyenko | 2011-07-27 | 2 | -0/+8 |
|/ / / / | |||||
* | | | | Add a proxy_association method to association proxies, which can be called ↵ | Jon Leighton | 2011-07-27 | 4 | -6/+27 |
| | | | | | | | | | | | | | | | | by association extensions to access information about the association. This replaces proxy_owner etc with proxy_association.owner. | ||||
* | | | | Merge pull request #2296 from lsylvester/typo | Xavier Noria | 2011-07-27 | 1 | -5/+5 |
|\ \ \ \ | | | | | | | | | | | fix some typos | ||||
| * | | | | fix some types in schema_test.rb | Lachlan Sylvester | 2011-07-27 | 1 | -5/+5 |
|/ / / / | |||||
* | | | | 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 |
| | | | | |||||
* | | | | Merge pull request #2291 from jdelStrother/load_missing_constant | Aaron Patterson | 2011-07-26 | 1 | -2/+1 |
|\ \ \ \ | | | | | | | | | | | Replace unnecessary regexp in Dependencies#load_missing_constant | ||||
| * | | | | Replace unnecessary regexp in Dependencies#load_missing_constant | Jonathan del Strother | 2011-07-27 | 1 | -2/+1 |
| | | | | | |||||
* | | | | | Merge pull request #2279 from jdelStrother/load_missing_constant | Santiago Pastorino | 2011-07-26 | 1 | -1/+2 |
|\| | | | | | | | | | | | | | | Constantize a regexp in Dependencies#load_missing_constant | ||||
| * | | | | Constantize a regexp in Dependencies#load_missing_constant | Jonathan del Strother | 2011-07-26 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | 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. | ||||
* | | | | | | Remove cruise files | Santiago Pastorino | 2011-07-26 | 5 | -415/+0 |
| | | | | | | |||||
* | | | | | | 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 | ||||
* | | | | | | Merge pull request #2285 from castlerock/remove_warnings_ruby193 | Santiago Pastorino | 2011-07-26 | 1 | -2/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | remove unused variables warnings removed |