aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* sprockets gem update to beta9 Arun Agrawal2011-05-311-1/+1
* Merge pull request #1417 from arunagw/nested_attributes_fixAaron Patterson2011-05-312-8/+11
|\
| * Opening class CascadedEagerLoadingTest at once.Arun Agrawal2011-05-311-7/+3
| * Adding comment to work with 1.8.7. Nested Attribute fix.Arun Agrawal2011-05-311-0/+3
| * Fix nested attribute for memory record.Arun Agrawal2011-05-311-1/+5
* | Update CHANGELOG.José Valim2011-05-311-0/+2
* | Transform the symbol into a constant lookup.José Valim2011-05-313-29/+32
* | Merge pull request #1403 from bogdan/configJosé Valim2011-05-313-12/+48
|\ \
| * | ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer methodBogdan Gusiev2011-05-303-12/+48
* | | Merge pull request #1415 from brainopia/masterJosé Valim2011-05-301-5/+0
|\ \ \ | |_|/ |/| |
| * | Remove autoload for a couple of constants which don't exist anymorebrainopia2011-05-311-5/+0
|/ /
* | Merge pull request #1410 from lucasts/pg_schemaAaron Patterson2011-05-301-5/+11
|\ \
| * | [activerecord][postgresql] verify if table has a schema(not public)Lucas Stephanou2011-05-271-6/+5
| * | find sequences with pg schemas properlyLucas Stephanou2011-05-271-4/+11
* | | Merge pull request #1404 from commuter/plugin_new_generator_should_properly_r...José Valim2011-05-303-1/+27
|\ \ \
| * | | properly require javascript libraries when generating mountable engineJ. Edward Dewyea2011-05-303-1/+27
| | |/ | |/|
* | | Merge pull request #1355 from gnufied/masterJoshua Peek2011-05-301-0/+8
|\ \ \ | |/ / |/| |
| * | refectored assets:clean taskVishnu Atrai2011-05-301-3/+1
| * | rename task and Rake::FileList used Vishnu Atrai2011-05-271-3/+3
| * | Add rake task to implement assets:cleanup, fixes Github Issues # 1284Bhavin Kamani2011-05-271-0/+10
| |/
* | avoid creating range objectsAaron Patterson2011-05-291-1/+1
* | Merge pull request #1398 from leereilly/my_new_branchAaron Patterson2011-05-296-10/+10
|\ \
| * | Corrected some typos and American vs. Queen's English issuesLee Reilly2011-05-296-10/+10
|/ /
* | Merge pull request #1384 from amatsuda/simplify_drop_tableAaron Patterson2011-05-283-10/+2
|\ \
| * | No need to pass options which is never usedAkira Matsuda2011-05-291-2/+2
| * | No need to override for just calling superAkira Matsuda2011-05-292-8/+0
* | | Merge pull request #1380 from vijaydev/session_migrationJosé Valim2011-05-281-5/+1
|\ \ \
| * | | Use change in place of up and down in sessions table migrationVijay Dev2011-05-281-5/+1
| |/ /
* | | Merge pull request #1203 from dchelimsky/stringify-parameter-values-in-testsJosé Valim2011-05-282-0/+29
|\ \ \ | |/ / |/| |
| * | use to_param (and change method to name accordingly)David Chelimsky2011-05-221-8/+8
| * | Stringify param values in controller tests.David Chelimsky2011-05-222-0/+29
* | | Merge pull request #1378 from AndrewRadev/masterJosé Valim2011-05-281-0/+3
|\ \ \
| * | | ActiveSupport CHANGELOG entry moved to correct placeAndrew Radev2011-05-281-2/+2
| * | | Update CHANGELOG for ActiveSupport::OrderedHash changeAndrew Radev2011-05-281-0/+3
* | | | Merge pull request #1373 from anbotero/masterJosé Valim2011-05-281-1/+1
|\ \ \ \
| * | | | Fix typo in test.Andrés Botero2011-05-281-1/+1
|/ / / /
* | | | Merge pull request #1372 from jacott/masterJosé Valim2011-05-273-11/+13
|\ \ \ \
| * | | | fixed asset_paths when called from sprockets for relative_url_rootjacott2011-05-283-11/+13
* | | | | Merge pull request #1371 from FLOChip/typoXavier Noria2011-05-271-9/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | minor typo in the rdoc about Interceptor.Teng Siong Ong2011-05-281-1/+1
| * | | | minor spacing fix in code example in ActionMailer::Base.Teng Siong Ong2011-05-281-8/+8
|/ / / /
* | | | Merge pull request #1368 from amatsuda/disable_im_by_default_on_testAaron Patterson2011-05-271-2/+2
|\ \ \ \
| * | | | Disable IdentityMap by default for ActiveRecord testingAkira Matsuda2011-05-281-2/+2
|/ / / /
* | | | stop using boolean expressions because of the side effectsAaron Patterson2011-05-271-1/+4
* | | | Merge pull request #1365 from gnufied/sqlite3Aaron Patterson2011-05-272-2/+2
|\ \ \ \
| * | | | delegate connection and column_hash calls directly to modelHemant Kumar2011-05-281-1/+1
| * | | | close statment only if its not closedHemant Kumar2011-05-281-1/+1
* | | | | Merge pull request #1229 from workmad3/masterAaron Patterson2011-05-272-2/+16
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added a test to check for correct behaviour with no options in add_index comm...David Workman2011-05-241-0/+6
| * | | | Using .try to test for the existence of a method option in a nil-resistent ma...David Workman2011-05-231-5/+2