aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* standarize documentation (and indirectly code) to use American English as ↵Xavier Noria2011-05-311-0/+4
| | | | | | | | | discussed in 4f234bf Please do not perform monster patches for this until 3.1 is out. Also, no existing API should be affected by this. New code, local variables, etc. would follow this guideline to have a consistent project tree in this regard.
* revises commit from pull request 1408Xavier Noria2011-05-311-4/+7
|
* revises commit from pull request 1409Xavier Noria2011-05-311-4/+8
|
* Modified generated text to explain where .js and .coffee files can be ↵Noel Gomez2011-05-311-3/+5
| | | | located and that there shouldn't be blank lines in manifest per this issue http://groups.google.com/group/rubyonrails-talk/browse_thread/thread/effb868290c2c0b8
* changed text to be more explicit about where stylesheets can be locatedNoel Gomez2011-05-311-2/+5
|
* Ensure that calculations properly override the select value even if it's set ↵Jon Leighton2011-05-312-2/+7
| | | | in the default scope. Fixes #1395.
* Failing test for aggregating on default_scope with selectErik Fonselius2011-05-312-0/+9
|
* Only save the record once when calling create! on a collection association. ↵Jon Leighton2011-05-314-25/+45
| | | | Fixes #1360.
* Tests for issue #1360Farley Knight2011-05-312-0/+24
|
* Implementing @dmathieu's cleaner fix from #1425. Unfortunately he deleted ↵Jon Leighton2011-05-311-8/+5
| | | | the branch so I cannot just merge it.
* Reduce test noiseJon Leighton2011-05-311-20/+14
|
* Merge pull request #1417 from arunagw/nested_attributes_fixAaron Patterson2011-05-312-8/+11
|\ | | | | Fix nested attribute for memory record.
| * 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 method
| * | ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer methodBogdan Gusiev2011-05-303-12/+48
| | | | | | | | | | | | | | | In order to specify your own sanitize method Implemented .mass_assignment_sanitizer configuration option
* | | Merge pull request #1415 from brainopia/masterJosé Valim2011-05-301-5/+0
|\ \ \ | |_|/ |/| | Remove autoload for non-existing constants
| * | 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
|\ \ | | | | | | a little step to better postgresql schema support in rails
| * | [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 ↵José Valim2011-05-303-1/+27
|\ \ \ | | | | | | | | | | | | | | | | commuter/plugin_new_generator_should_properly_require_js properly require javascript libraries when generating mountable engine
| * | | 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
|\ \ \ | |/ / |/| | Adds rake task to cleanup compiled assets
| * | 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 issues
| * | 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
|\ \ | | | | | | Remove unused options from drop_table
| * | 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 3.1 style migration for sessions table
| * | | 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
|\ \ \ | |/ / |/| | Stringify param values in controller tests.
| * | use to_param (and change method to name accordingly)David Chelimsky2011-05-221-8/+8
| | | | | | | | | | | | | | | - exclude Rack::Test::UploadedFile to pass existing tests. Are there any other types we're missing?
| * | Stringify param values in controller tests.David Chelimsky2011-05-222-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | This reduces false positives that come from using ints in params in tests, which do not get converted to strings in the tests. In implementations going through rack, they do get converted to strings. - David Chelimsky and Sam Umbach
* | | Merge pull request #1378 from AndrewRadev/masterJosé Valim2011-05-281-0/+3
|\ \ \ | | | | | | | | Add changelog entry for pull request #1359
| * | | 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
|\ \ \ \ | | | | | | | | | | Minor typo corrected
| * | | | Fix typo in test.Andrés Botero2011-05-281-1/+1
|/ / / /
* | | | Merge pull request #1372 from jacott/masterJosé Valim2011-05-273-11/+13
|\ \ \ \ | | | | | | | | | | Fix for relative_url_root when used with sprockets
| * | | | 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
|\ \ \ \ \ | |/ / / / |/| | | | Typo in ActionMailer::Base
| * | | | minor typo in the rdoc about Interceptor.Teng Siong Ong2011-05-281-1/+1
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 09:13:59 +0000