Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Should save without validation if autosave is enabled. | Emilio Tagua | 2010-12-20 | 1 | -2/+4 |
| | |||||
* | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2010-12-20 | 283 | -3115/+6147 |
|\ | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/autosave_association.rb activerecord/lib/active_record/base.rb activerecord/lib/active_record/persistence.rb | ||||
| * | Small changes on AD::Reloader. | José Valim | 2010-12-20 | 5 | -45/+14 |
| | | |||||
| * | Use AD::Reloader.to_cleanup for reloading [#2873 state:resolved] | John Firebaugh | 2010-12-20 | 2 | -10/+6 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Replace AD::Callbacks.to_prepare with AD::Reloader.to_prepare | John Firebaugh | 2010-12-20 | 9 | -96/+34 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Introduce ActionDispatch::Reloader | John Firebaugh | 2010-12-20 | 5 | -0/+230 |
| | | | | | | | | | | | | | | | | | | | | | | | | Based on the implementation on the 2-3-stable branch, patches by Hongli Lai <hongli@phusion.nl>, and helpful suggestions from José Valim. Hongli Lai's patches included locking around the request cycle; this is now handled by Rack::Lock (https://github.com/rack/rack/issues/issue/87/). [#2873] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | More love for engines tests | Piotr Sarnacki | 2010-12-19 | 1 | -73/+61 |
| | | |||||
| * | Use assert_body | John Firebaugh | 2010-12-19 | 1 | -22/+14 |
| | | |||||
| * | Remove require AS::Concern from places where is already in | Santiago Pastorino | 2010-12-19 | 4 | -5/+0 |
| | | |||||
| * | Tests and docs which explain the use of validate with a block and without ↵ | Santiago Pastorino | 2010-12-19 | 2 | -2/+20 |
| | | | | | | | | arguments | ||||
| * | Remove weak_passwords list and the length/strong password validator, leave ↵ | Santiago Pastorino | 2010-12-19 | 4 | -89/+12 |
| | | | | | | | | that up to the programmer | ||||
| * | Temporary fix for railties test for newest rack changes | Piotr Sarnacki | 2010-12-19 | 1 | -0/+8 |
| | | |||||
| * | Fix indentation | Santiago Pastorino | 2010-12-19 | 1 | -3/+3 |
| | | |||||
| * | Use Concern in Rails::Railtie::Configurable | Santiago Pastorino | 2010-12-19 | 1 | -3/+3 |
| | | |||||
| * | Add missing require | Santiago Pastorino | 2010-12-19 | 1 | -0/+1 |
| | | |||||
| * | Refactoring of application's task in engine.rake | Piotr Sarnacki | 2010-12-19 | 1 | -20/+23 |
| | | |||||
| * | Do not load all application's task in generated engine | Piotr Sarnacki | 2010-12-19 | 2 | -6/+69 |
| | | |||||
| * | Use class_attribute to ensure weak_passwords are inheritable. | José Valim | 2010-12-19 | 1 | -18/+8 |
| | | |||||
| * | Add set_weak_passwords call in alignment with set_table_name. | Mikel Lindsaar | 2010-12-19 | 2 | -5/+16 |
| | | |||||
| * | Fix incorrect docs | Mikel Lindsaar | 2010-12-19 | 1 | -3/+1 |
| | | |||||
| * | Added ability to specify which passwords you want as weak passwords | Mikel Lindsaar | 2010-12-19 | 2 | -17/+56 |
| | | |||||
| * | 'unsecure' => 'insecure' | José Valim | 2010-12-19 | 2 | -2/+2 |
| | | |||||
| * | Make password messages translatable. | José Valim | 2010-12-19 | 3 | -3/+7 |
| | | |||||
| * | Add missing require and remove extra module. | José Valim | 2010-12-19 | 1 | -20/+19 |
| | | |||||
| * | Avoid warnings and fix small typo on SecurePassword. | José Valim | 2010-12-19 | 2 | -4/+6 |
| | | |||||
| * | BCrypt does its own salting, lovely! | David Heinemeier Hansson | 2010-12-18 | 2 | -12/+22 |
| | | |||||
| * | Switch from SHA2 to BCrypt (easy Windows compatibility is coming shortly ↵ | David Heinemeier Hansson | 2010-12-18 | 4 | -9/+11 |
| | | | | | | | | with new compiled gem) | ||||
| * | Added ActiveRecord::Base#has_secure_password (via ↵ | David Heinemeier Hansson | 2010-12-18 | 7 | -1/+148 |
| | | | | | | | | ActiveModel::SecurePassword) to encapsulate dead-simple password usage with SHA2 encryption and salting | ||||
| * | Fix tests in railties | Piotr Sarnacki | 2010-12-18 | 2 | -13/+13 |
| | | |||||
| * | Use gemspec instead of gem rails in Gemfile | Piotr Sarnacki | 2010-12-18 | 1 | -1/+2 |
| | | |||||
| * | Fixed number_with_precision rounding error [#6182 state:resolved] | Don Wilson | 2010-12-18 | 2 | -2/+8 |
| | | |||||
| * | dry up case / when statement | Aaron Patterson | 2010-12-17 | 1 | -5/+3 |
| | | |||||
| * | Use require 'bundler/setup' instead of directly calling Bundler.setup in ↵ | Piotr Sarnacki | 2010-12-17 | 1 | -10/+3 |
| | | | | | | | | config/boot.rb | ||||
| * | Revert "Fixed number_with_precision rounding error [#6182 state:resolved]" | Piotr Sarnacki | 2010-12-17 | 2 | -8/+2 |
| | | | | | | | | This reverts commit 006ec77e60163d57d655479602230672d98e0f10. | ||||
| * | Allow to use BUNDLE_GEMFILE env variable in boot.rb [#6184 state:resolved] | Piotr Sarnacki | 2010-12-17 | 1 | -1/+1 |
| | | |||||
| * | Fixed number_with_precision rounding error [#6182 state:resolved] | Don Wilson | 2010-12-17 | 2 | -2/+8 |
| | | |||||
| * | Generate add_index by default when giving type belongs_to or references | Santiago Pastorino | 2010-12-16 | 4 | -3/+34 |
| | | |||||
| * | Changelog and guide entries for config.action_view.cache_template_loading | Piotr Sarnacki | 2010-12-16 | 2 | -0/+4 |
| | | |||||
| * | ActiveRecord::Base.joins should allow single nil argument [#6181 state:resolved] | Piotr Sarnacki | 2010-12-16 | 2 | -1/+5 |
| | | |||||
| * | Bring back config.action_view.cache_template_loading [#5847 state:resolved] | Piotr Sarnacki | 2010-12-16 | 4 | -4/+63 |
| | | |||||
| * | dragdrop was tested twice and effects.js was missing, added checks for ↵ | Santiago Pastorino | 2010-12-16 | 1 | -1/+4 |
| | | | | | | | | controls.js, dragdrop.js and effects.js to another test | ||||
| * | Fix various issues with the :primary_key option in :through associations ↵ | Jon Leighton | 2010-12-15 | 6 | -18/+48 |
| | | | | | | | | [#2421 state:resolved] | ||||
| * | Fix problem with duplicated records when a :uniq :through association is ↵ | Jon Leighton | 2010-12-15 | 3 | -2/+16 |
| | | | | | | | | preloaded [#2447 state:resolved] | ||||
| * | dry up compute type in attribute | Aaron Patterson | 2010-12-15 | 1 | -16/+10 |
| | | |||||
| * | Replace rudimentary named_scope with scope. [#6052 state:resolved] | Pavel Gorbokon | 2010-12-15 | 6 | -38/+38 |
| | | | | | | | | | | | | | | * rename method names (actually in tests) * rename instance variable @_named_scopes_cache to @_scopes_cache * rename references in doc comments * don't touch CHANGELOG :) | ||||
| * | Provide test for #4840: to_xml doesn't work in such case: ↵ | Franck Verrot | 2010-12-15 | 1 | -0/+6 |
| | | | | | | | | Event.select('title as t').to_xml | ||||
| * | to_xml doesn't work in such case: Event.select('title as t').to_xml [#4840 ↵ | Víctor Martínez | 2010-12-15 | 1 | -2/+8 |
| | | | | | | | | | | | | state:resolved] NilClass.type is no longer defined in Ruby 1.9 and causes ActiveRecord::Base.to_xml to fail with message: undefined method `type' for nil:NilClass | ||||
| * | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2010-12-16 | 0 | -0/+0 |
| |\ | |||||
| | * | Merge branch 'master' of github.com:rails/rails | Xavier Noria | 2010-12-15 | 1 | -1/+9 |
| | |\ | |||||
| | | * | test for eager load of has_one association with condition on the through table | Pivotal Labs | 2010-12-15 | 1 | -1/+9 |
| | | | |