aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fixed test case test_render_json_with_callback to use content_type ↵Olli Jokinen2011-07-281-1/+1
| | | | application/javascript
* Change mimetype to Mime::JS if JSONP is usedOlli Jokinen2011-07-281-1/+4
|
* Update CHANGELOG.José Valim2011-07-281-0/+2
|
* 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-282-5/+7
| | | | internal method.
* Merge pull request #2034 from Casecommons/to_pathJosé Valim2011-07-2810-33/+131
|\ | | | | Allow ActiveModel-compatible instances to define their own partial paths
| * Let ActiveModel instances define partial paths.Grant Hutchins & Peter Jaros2011-07-2510-33/+131
| | | | | | | | | | | | 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
| |
* | Merge pull request #2309 from smasry/masterAaron Patterson2011-07-272-1/+6
|\ \ | | | | | | Unmangaling reverse_sql_order when function is used
| * | Reverse order fix when using function for ActiveRecord::QueryMethods Fixes #1697Samer Masry2011-07-272-1/+6
|/ /
* | Merge pull request #2305 from thedarkone/errors-includeSantiago Pastorino2011-07-272-1/+2
|\ \ | | | | | | Improve AM::Errors#include?
| * | Handle the empty array correctly.thedarkone2011-07-272-1/+2
| | |
* | | Improve performance and memory usage for options_for_select with Ruby 1.8.7Christos Zisopoulos2011-07-271-2/+2
| | |
* | | Merge pull request #1969 from ↵Jon Leighton2011-07-272-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 Kiriyenko2011-07-272-0/+8
|/ / /
* | | Add a proxy_association method to association proxies, which can be called ↵Jon Leighton2011-07-274-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/typoXavier Noria2011-07-271-5/+5
|\ \ \ | | | | | | | | fix some typos
| * | | fix some types in schema_test.rbLachlan Sylvester2011-07-271-5/+5
|/ / /
* | | 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
| | |
* | | Merge pull request #2291 from jdelStrother/load_missing_constantAaron Patterson2011-07-261-2/+1
|\ \ \ | | | | | | | | Replace unnecessary regexp in Dependencies#load_missing_constant
| * | | Replace unnecessary regexp in Dependencies#load_missing_constantJonathan del Strother2011-07-271-2/+1
| | | |
* | | | Merge pull request #2279 from jdelStrother/load_missing_constantSantiago Pastorino2011-07-261-1/+2
|\| | | | | | | | | | | Constantize a regexp in Dependencies#load_missing_constant
| * | | Constantize a regexp in Dependencies#load_missing_constantJonathan del Strother2011-07-261-1/+2
| | | |
* | | | 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.
* | | | | Remove cruise filesSantiago Pastorino2011-07-265-415/+0
| | | | |
* | | | | 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
* | | | | | Merge pull request #2285 from castlerock/remove_warnings_ruby193Santiago Pastorino2011-07-261-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove unused variables warnings removed
| * | | | | | remove unused variables warnings removedVishnu Atrai2011-07-261-2/+0
| | | | | | |
* | | | | | | Merge pull request #2284 from joshk/patch-6Santiago Pastorino2011-07-261-3/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | enable Travis CI irc notifications to #rails-contrib on irc.freenode.org
| * | | | | | enable Travis CI irc notifications to #rails-contrib on irc.freenode.orgJosh Kalderimis2011-07-261-3/+5
|/ / / / / /
* | | | | | Merge pull request #2283 from castlerock/remove_warnings_ruby193Aaron Patterson2011-07-261-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove deprication warning: ambiguous first argument; put parentheses or
| * | | | | | remove deprication warning: ambiguous first argument; put parentheses or ↵Vishnu Atrai2011-07-261-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | even spaces
* | | | | | fixing tests on ruby trunkAaron Patterson2011-07-261-1/+1
| | | | | |
* | | | | | fixing whitespace errorsAaron Patterson2011-07-261-9/+9
| | | | | |
* | | | | | Merge pull request #2281 from castlerock/remove_warnings_ruby193Santiago Pastorino2011-07-261-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove deprication warning for ruby 1.9.3-head for unused variable
| * | | | | | remove deprication warning for ruby 1.9.3-head for unused variablesVishnu Atrai2011-07-261-1/+1
|/ / / / / /
* | | | | | Merge pull request #2277 from dmathieu/fix_actionpack_testsJosé Valim2011-07-261-26/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix actionpack's test suite
| * | | | | | use sprocket's append_path and assert_matchDamien Mathieu2011-07-261-26/+26
|/ / / / / /
* | | / / / Revert "allow select to have multiple arguments"Piotr Sarnacki2011-07-262-11/+3
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 04cc446d178653d362510e79a22db5300d463161. I reverted it because apparently we want to use: select([:a, :b]) instead of select(:a, :b), but there was no tests for that form.
* | | | | Merge pull request #2271 from slawosz/enhance_select_method_apiPiotr Sarnacki2011-07-262-3/+11
|\ \ \ \ \ | | | | | | | | | | | | allow select to have multiple arguments ie. Post.select(:id,:name,:author)
| * | | | | allow select to have multiple argumentsSławosz Sławiński2011-07-262-3/+11
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2272 from cesario/fix_relations_testSantiago Pastorino2011-07-261-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Simplify the test by using id and name.
| * | | | Simplify the test by using id and name. `id` will be the only real sort ↵Franck Verrot2011-07-261-1/+1
|/ / / / | | | | | | | | | | | | criteria in any case as it's unique.