| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Merge branch '3-2-stable' of github.com:rails/rails into 3-2-stable | Aaron Patterson | 2011-12-22 | 8 | -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 apps | Santiago Pastorino | 2011-12-22 | 1 | -1/+1 | |
| | | | ||||||
| | * | Make ActiveRecord::Relation#pluck work with serialized attributes | Jon Leighton | 2011-12-22 | 2 | -5/+12 | |
| | | | ||||||
| | * | Make read_attribute code path accessible at the class level | Jon Leighton | 2011-12-22 | 5 | -56/+48 | |
| | | | ||||||
| * | | rack bodies should be a list | Aaron Patterson | 2011-12-22 | 1 | -7/+7 | |
| | | | ||||||
| * | | refactoring routing tests | Aaron Patterson | 2011-12-22 | 1 | -34/+19 | |
| |/ | ||||||
| * | Merge branch '3-2-stable' of github.com:rails/rails into 3-2-stable | Aaron Patterson | 2011-12-22 | 1 | -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-stable | Piotr Sarnacki | 2011-12-22 | 1 | -1/+1 | |
| | |\ | | | | | | | Doc fixes 3 2 stable | |||||
| | | * | [docs] added missing "}" fixes #4126 | Arun Agrawal | 2011-12-22 | 1 | -1/+1 | |
| | |/ | ||||||
| * / | Revert "Added Enumerable#pluck to wrap the common pattern of ↵ | Aaron Patterson | 2011-12-22 | 3 | -19/+3 | |
| |/ | | | | | | collect(&:method) *DHH*" This reverts commit 4d20de8a50d889a09e6f5642984775fe796ca943. | |||||
| * | just require things once | Aaron Patterson | 2011-12-21 | 1 | -4/+2 | |
| | | ||||||
| * | append puts the routes after the default, which causes a 404. instead use ↵ | Aaron Patterson | 2011-12-21 | 1 | -1/+1 | |
| | | | | | prepend | |||||
| * | raises an ArgumentError if no valid options are given to ↵ | Lucas Mazza | 2011-12-21 | 2 | -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źma | 2011-12-21 | 4 | -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 Kemper | 2011-12-21 | 3 | -48/+44 | |
| | | ||||||
| * | adding integration test for journey #7 | Aaron Patterson | 2011-12-21 | 1 | -0/+22 | |
| | | ||||||
| * | caches should not be global, so no need to clear in the teardown | Aaron Patterson | 2011-12-21 | 1 | -4/+0 | |
| | | ||||||
| * | Rails::SubTestTask warns on test failure and moves on. Renamed from ↵ | Jeremy Kemper | 2011-12-21 | 1 | -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 Tanata | 2011-12-21 | 1 | -3/+3 | |
| | | ||||||
| * | Merge pull request #4080 from heimidal/3-2-stable | José Valim | 2011-12-20 | 2 | -1/+19 | |
| |\ | | | | | Fix regression in select form helper when options are non-string values | |||||
| | * | Check for response to `#last` instead of `#first`. | Brian Rose | 2011-12-20 | 1 | -1/+1 | |
| | | | ||||||
| | * | Ensure option for select helper responds to `#first` before comparison. | Brian Rose | 2011-12-20 | 2 | -1/+19 | |
| |/ | ||||||
| * | Merge pull request #4069 from arunagw/issue_4067 | Santiago Pastorino | 2011-12-20 | 1 | -1/+1 | |
| |\ | | | | | It should be README.rdoc | |||||
| | * | It should be README.rdoc fixes #4067 | Arun Agrawal | 2011-12-20 | 1 | -1/+1 | |
| |/ | ||||||
| * | Merge pull request #4064 from nashby/date-helper-field-error-proc | José Valim | 2011-12-20 | 4 | -12/+35 | |
| |\ | | | | | fix adding field_with_errors to date selects, closes #3487 | |||||
| | * | fix adding field_with_errors to date selects, closes #3487 | Vasiliy Ermolovich | 2011-12-20 | 3 | -11/+11 | |
| | | | ||||||
| | * | add failing tests for issue #3487 | Vasiliy Ermolovich | 2011-12-19 | 1 | -1/+24 | |
| | | | ||||||
| * | | Fix reference to old :sql schema_format location | Alex Tambellini | 2011-12-20 | 1 | -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 Tanata | 2011-12-20 | 1 | -6/+8 | |
| | | | ||||||
| * | | Depend on 3-2-stable. | José Valim | 2011-12-20 | 1 | -2/+2 | |
| | | | ||||||
| * | | Add a test case for layout nil. | José Valim | 2011-12-20 | 2 | -12/+17 | |
| | | | ||||||
| * | | remove warnings about @variable_for_layout | lest | 2011-12-20 | 1 | -5/+6 | |
| | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | | Check if source is encoding aware. | José Valim | 2011-12-20 | 1 | -32/+30 | |
| | | | ||||||
| * | | Do not hard code encoding to UTF8 | José Valim | 2011-12-20 | 2 | -48/+54 | |
| | | | ||||||
| * | | don't encode an UTF-8 encoded template | Xu Pan | 2011-12-20 | 2 | -2/+3 | |
| | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | | Remove i18n dependencies from AP and AMo since they are in AS. | José Valim | 2011-12-20 | 2 | -2/+0 | |
| | | | ||||||
| * | | Party like its R-C-UNO! | David Heinemeier Hansson | 2011-12-19 | 9 | -9/+9 | |
| | | | ||||||
| * | | Add an invitation to use jbuilder, since we are not going to bundle it in 3.2 | David Heinemeier Hansson | 2011-12-19 | 1 | -0/+3 | |
| | | | ||||||
| * | | Merge pull request #4036 from Juanmcuello/database_tasks | Piotr Sarnacki | 2011-12-19 | 1 | -9/+22 | |
| |\ \ | | | | | | | Fix database tasks in test namespace. | |||||
| | * | | Fix database tasks in test namespace. | Juan M. Cuello | 2011-12-19 | 1 | -9/+22 | |
| | |/ | | | | | | | | | This is mostly the same as 876bade5999c51f5031861f703933d50e48512ff that was reverted due to test failures, but now with a correction. | |||||
| * / | adding tests for #4029 | Aaron Patterson | 2011-12-19 | 2 | -1/+52 | |
| |/ | ||||||
| * | Revert "Merge pull request #4030 from Juanmcuello/database_tasks" | José Valim | 2011-12-19 | 1 | -20/+9 | |
| | | | | | | This reverts commit a0edfb4d204857f0885784bd12582ae526af43c3, reversing changes made to 4012fcff22e4fe7833aae53b98e3ca9acfe3d3ad. | |||||
| * | Merge pull request #4030 from Juanmcuello/database_tasks | José Valim | 2011-12-19 | 1 | -9/+20 | |
| |\ | | | | | Fix database tasks in test namespace. | |||||
| | * | Fix database tasks in test namespace. | Juan M. Cuello | 2011-12-19 | 1 | -9/+20 | |
| |/ | ||||||
| * | Don't notify campfire when the build keeps passing | Jon Leighton | 2011-12-18 | 1 | -1/+4 | |
| | | ||||||
| * | fix a minor typo | Vijay Dev | 2011-12-19 | 1 | -1/+1 | |
| | | ||||||
| * | Update activerecord/lib/active_record/railties/databases.rake | José Valim | 2011-12-18 | 1 | -1/+1 | |
| | | ||||||
| * | Merge pull request #4019 from kommen/rake_db_structure | José Valim | 2011-12-18 | 2 | -13/+23 | |
| |\ | | | | | Make structure.sql file configureable in db:structure:dump analog to SCHEMA in db:schema:dump | |||||
| | * | Rename STRUCTURE to DB_STRUCTURE, update dump task description and add ↵ | Dieter Komendera | 2011-12-18 | 2 | -3/+11 | |
| | | | | | | | | | simple testcase. | |||||
| | * | Make structure file configureable in db:structure:dump analog to SCHEMA in ↵ | Dieter Komendera | 2011-12-16 | 1 | -12/+14 | |
| | | | | | | | | | db:schema dump and clean up a bit. | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |