aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* serialize fails on subclassAlvaro Bautista2011-12-234-6/+32
|
* removes Enumerable#pluck from the AS guideXavier Noria2011-12-231-10/+0
|
* Merge pull request #4141 from arunagw/fix_buildJosé Valim2011-12-221-4/+3
|\ | | | | Fix build 3-2-stable
| * Fix build when IM=trueJon Leighton2011-12-231-4/+3
|/
* adding an integration test for splat regexp substitutions. fixes #4138Aaron Patterson2011-12-221-0/+13
|
* Adding an integration test. Fixes #4136Aaron Patterson2011-12-221-0/+9
|
* Merge branch '3-2-stable' of github.com:rails/rails into 3-2-stableAaron Patterson2011-12-228-62/+61
|\ | | | | | | | | | | | | * '3-2-stable' of github.com:rails/rails: Use sass-rails >= 3.2.2 for new apps Make ActiveRecord::Relation#pluck work with serialized attributes Make read_attribute code path accessible at the class level
| * 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
|\ | | | | | | | | * '3-2-stable' of github.com:rails/rails: [docs] added missing "}" fixes #4126
| * Merge pull request #4128 from arunagw/doc_fixes_3_2-stablePiotr Sarnacki2011-12-221-1/+1
| |\ | | | | | | Doc fixes 3 2 stable
| | * [docs] added missing "}" fixes #4126Arun Agrawal2011-12-221-1/+1
| |/
* / Revert "Added Enumerable#pluck to wrap the common pattern of ↵Aaron Patterson2011-12-223-19/+3
|/ | | | | | collect(&:method) *DHH*" This reverts commit 4d20de8a50d889a09e6f5642984775fe796ca943.
* just require things onceAaron Patterson2011-12-211-4/+2
|
* append puts the routes after the default, which causes a 404. instead use ↵Aaron Patterson2011-12-211-1/+1
| | | | prepend
* raises an ArgumentError if no valid options are given to ↵Lucas Mazza2011-12-212-4/+13
| | | | | | TemplateRenderer#determine_template Signed-off-by: José Valim <jose.valim@gmail.com>
* added failing tests for has_many, has_one and belongs_to associations with ↵Jakub Kuźma2011-12-214-13/+66
| | | | | | strict mass assignment sanitizer, fixed build_record to not merge creation_attributes, removed failing nested attributes tests (that feature was broken anyway) #4051 Signed-off-by: José Valim <jose.valim@gmail.com>
* 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 ↵Jeremy Kemper2011-12-211-43/+40
| | | | | | | | | | | | | | | | | TestTaskWithoutDescription. This makes it easier to add your own tests to the default suite: namespace :test do task run: 'test:acceptance' Rails::SubTestTask.new acceptance: 'test:prepare' do |t| t.libs << 'test' t.pattern = 'test/acceptance/**/*_test.rb' end end Now `rake` runs unit, functional, integration, and acceptance tests.
* 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
|\ | | | | Fix regression in select form helper when options are non-string values
| * 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
| * 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 #3487
| * 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
| | | | | | | | | | | | After 15fb430 the default location of the :sql schema_format location was changed from environment_name.sql to structure.sql. This pull request updates a reference to the old schema format location in the migration guides.
* | 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
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | 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
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | 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.
| * | Fix database tasks in test namespace.Juan M. Cuello2011-12-191-9/+22
| |/ | | | | | | | | This is mostly the same as 876bade5999c51f5031861f703933d50e48512ff that was reverted due to test failures, but now with a correction.
* / adding tests for #4029Aaron Patterson2011-12-192-1/+52
|/
* Revert "Merge pull request #4030 from Juanmcuello/database_tasks"José Valim2011-12-191-20/+9
| | | | | This reverts commit a0edfb4d204857f0885784bd12582ae526af43c3, reversing changes made to 4012fcff22e4fe7833aae53b98e3ca9acfe3d3ad.
* Merge pull request #4030 from Juanmcuello/database_tasksJosé Valim2011-12-191-9/+20
|\ | | | | Fix database tasks in test namespace.
| * Fix database tasks in test namespace.Juan M. Cuello2011-12-191-9/+20
|/