aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3-2-stable' of github.com:rails/rails into 3-2-stableAaron Patterson2011-12-228-62/+61
|\
| * Use sass-rails >= 3.2.2 for new appsSantiago Pastorino2011-12-221-1/+1
| * Make ActiveRecord::Relation#pluck work with serialized attributesJon Leighton2011-12-222-5/+12
| * Make read_attribute code path accessible at the class levelJon Leighton2011-12-225-56/+48
* | rack bodies should be a listAaron Patterson2011-12-221-7/+7
* | refactoring routing testsAaron Patterson2011-12-221-34/+19
|/
* Merge branch '3-2-stable' of github.com:rails/rails into 3-2-stableAaron Patterson2011-12-221-1/+1
|\
| * Merge pull request #4128 from arunagw/doc_fixes_3_2-stablePiotr Sarnacki2011-12-221-1/+1
| |\
| | * [docs] added missing "}" fixes #4126Arun Agrawal2011-12-221-1/+1
| |/
* / Revert "Added Enumerable#pluck to wrap the common pattern of collect(&:method...Aaron Patterson2011-12-223-19/+3
|/
* just require things onceAaron Patterson2011-12-211-4/+2
* append puts the routes after the default, which causes a 404. instead use pre...Aaron Patterson2011-12-211-1/+1
* raises an ArgumentError if no valid options are given to TemplateRenderer#det...Lucas Mazza2011-12-212-4/+13
* added failing tests for has_many, has_one and belongs_to associations with st...Jakub Kuźma2011-12-214-13/+66
* Move SubTestTask. Soften up tests.Jeremy Kemper2011-12-213-48/+44
* adding integration test for journey #7Aaron Patterson2011-12-211-0/+22
* caches should not be global, so no need to clear in the teardownAaron Patterson2011-12-211-4/+0
* Rails::SubTestTask warns on test failure and moves on. Renamed from TestTaskW...Jeremy Kemper2011-12-211-43/+40
* Doc fixes on Rails::Generators::Base.hook_for.Hendy Tanata2011-12-211-3/+3
* Merge pull request #4080 from heimidal/3-2-stableJosé Valim2011-12-202-1/+19
|\
| * Check for response to `#last` instead of `#first`.Brian Rose2011-12-201-1/+1
| * Ensure option for select helper responds to `#first` before comparison.Brian Rose2011-12-202-1/+19
|/
* Merge pull request #4069 from arunagw/issue_4067Santiago Pastorino2011-12-201-1/+1
|\
| * It should be README.rdoc fixes #4067Arun Agrawal2011-12-201-1/+1
|/
* Merge pull request #4064 from nashby/date-helper-field-error-procJosé Valim2011-12-204-12/+35
|\
| * fix adding field_with_errors to date selects, closes #3487Vasiliy Ermolovich2011-12-203-11/+11
| * add failing tests for issue #3487Vasiliy Ermolovich2011-12-191-1/+24
* | Fix reference to old :sql schema_format locationAlex Tambellini2011-12-201-1/+1
* | Improve doc for ActiveRecord::Base.unscoped.Hendy Tanata2011-12-201-6/+8
* | Depend on 3-2-stable.José Valim2011-12-201-2/+2
* | Add a test case for layout nil.José Valim2011-12-202-12/+17
* | remove warnings about @variable_for_layoutlest2011-12-201-5/+6
* | Check if source is encoding aware.José Valim2011-12-201-32/+30
* | Do not hard code encoding to UTF8José Valim2011-12-202-48/+54
* | don't encode an UTF-8 encoded templateXu Pan2011-12-202-2/+3
* | Remove i18n dependencies from AP and AMo since they are in AS.José Valim2011-12-202-2/+0
* | Party like its R-C-UNO!David Heinemeier Hansson2011-12-199-9/+9
* | Add an invitation to use jbuilder, since we are not going to bundle it in 3.2David Heinemeier Hansson2011-12-191-0/+3
* | Merge pull request #4036 from Juanmcuello/database_tasksPiotr Sarnacki2011-12-191-9/+22
|\ \
| * | Fix database tasks in test namespace.Juan M. Cuello2011-12-191-9/+22
| |/
* / adding tests for #4029Aaron Patterson2011-12-192-1/+52
|/
* Revert "Merge pull request #4030 from Juanmcuello/database_tasks"José Valim2011-12-191-20/+9
* Merge pull request #4030 from Juanmcuello/database_tasksJosé Valim2011-12-191-9/+20
|\
| * Fix database tasks in test namespace.Juan M. Cuello2011-12-191-9/+20
|/
* Don't notify campfire when the build keeps passingJon Leighton2011-12-181-1/+4
* fix a minor typoVijay Dev2011-12-191-1/+1
* Update activerecord/lib/active_record/railties/databases.rakeJosé Valim2011-12-181-1/+1
* Merge pull request #4019 from kommen/rake_db_structureJosé Valim2011-12-182-13/+23
|\
| * Rename STRUCTURE to DB_STRUCTURE, update dump task description and add simple...Dieter Komendera2011-12-182-3/+11
| * Make structure file configureable in db:structure:dump analog to SCHEMA in db...Dieter Komendera2011-12-161-12/+14