aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'rails/master' into identity_mapEmilio Tagua2010-12-20283-3115/+6147
|\
| * Small changes on AD::Reloader.José Valim2010-12-205-45/+14
| * Use AD::Reloader.to_cleanup for reloading [#2873 state:resolved]John Firebaugh2010-12-202-10/+6
| * Replace AD::Callbacks.to_prepare with AD::Reloader.to_prepareJohn Firebaugh2010-12-209-96/+34
| * Introduce ActionDispatch::ReloaderJohn Firebaugh2010-12-205-0/+230
| * More love for engines testsPiotr Sarnacki2010-12-191-73/+61
| * Use assert_bodyJohn Firebaugh2010-12-191-22/+14
| * Remove require AS::Concern from places where is already inSantiago Pastorino2010-12-194-5/+0
| * Tests and docs which explain the use of validate with a block and without arg...Santiago Pastorino2010-12-192-2/+20
| * Remove weak_passwords list and the length/strong password validator, leave th...Santiago Pastorino2010-12-194-89/+12
| * Temporary fix for railties test for newest rack changesPiotr Sarnacki2010-12-191-0/+8
| * Fix indentationSantiago Pastorino2010-12-191-3/+3
| * Use Concern in Rails::Railtie::ConfigurableSantiago Pastorino2010-12-191-3/+3
| * Add missing requireSantiago Pastorino2010-12-191-0/+1
| * Refactoring of application's task in engine.rakePiotr Sarnacki2010-12-191-20/+23
| * Do not load all application's task in generated enginePiotr Sarnacki2010-12-192-6/+69
| * Use class_attribute to ensure weak_passwords are inheritable.José Valim2010-12-191-18/+8
| * Add set_weak_passwords call in alignment with set_table_name.Mikel Lindsaar2010-12-192-5/+16
| * Fix incorrect docsMikel Lindsaar2010-12-191-3/+1
| * Added ability to specify which passwords you want as weak passwordsMikel Lindsaar2010-12-192-17/+56
| * 'unsecure' => 'insecure'José Valim2010-12-192-2/+2
| * Make password messages translatable.José Valim2010-12-193-3/+7
| * Add missing require and remove extra module.José Valim2010-12-191-20/+19
| * Avoid warnings and fix small typo on SecurePassword.José Valim2010-12-192-4/+6
| * BCrypt does its own salting, lovely!David Heinemeier Hansson2010-12-182-12/+22
| * Switch from SHA2 to BCrypt (easy Windows compatibility is coming shortly with...David Heinemeier Hansson2010-12-184-9/+11
| * Added ActiveRecord::Base#has_secure_password (via ActiveModel::SecurePassword...David Heinemeier Hansson2010-12-187-1/+148
| * Fix tests in railtiesPiotr Sarnacki2010-12-182-13/+13
| * Use gemspec instead of gem rails in GemfilePiotr Sarnacki2010-12-181-1/+2
| * Fixed number_with_precision rounding error [#6182 state:resolved]Don Wilson2010-12-182-2/+8
| * dry up case / when statementAaron Patterson2010-12-171-5/+3
| * Use require 'bundler/setup' instead of directly calling Bundler.setup in conf...Piotr Sarnacki2010-12-171-10/+3
| * Revert "Fixed number_with_precision rounding error [#6182 state:resolved]"Piotr Sarnacki2010-12-172-8/+2
| * Allow to use BUNDLE_GEMFILE env variable in boot.rb [#6184 state:resolved]Piotr Sarnacki2010-12-171-1/+1
| * Fixed number_with_precision rounding error [#6182 state:resolved]Don Wilson2010-12-172-2/+8
| * Generate add_index by default when giving type belongs_to or referencesSantiago Pastorino2010-12-164-3/+34
| * Changelog and guide entries for config.action_view.cache_template_loadingPiotr Sarnacki2010-12-162-0/+4
| * ActiveRecord::Base.joins should allow single nil argument [#6181 state:resolved]Piotr Sarnacki2010-12-162-1/+5
| * Bring back config.action_view.cache_template_loading [#5847 state:resolved]Piotr Sarnacki2010-12-164-4/+63
| * dragdrop was tested twice and effects.js was missing, added checks for contro...Santiago Pastorino2010-12-161-1/+4
| * Fix various issues with the :primary_key option in :through associations [#24...Jon Leighton2010-12-156-18/+48
| * Fix problem with duplicated records when a :uniq :through association is prel...Jon Leighton2010-12-153-2/+16
| * dry up compute type in attributeAaron Patterson2010-12-151-16/+10
| * Replace rudimentary named_scope with scope. [#6052 state:resolved]Pavel Gorbokon2010-12-156-38/+38
| * Provide test for #4840: to_xml doesn't work in such case: Event.select('title...Franck Verrot2010-12-151-0/+6
| * to_xml doesn't work in such case: Event.select('title as t').to_xml [#4840 st...Víctor Martínez2010-12-151-2/+8
| * Merge branch 'master' of github.com:lifo/docrailsVijay Dev2010-12-160-0/+0
| |\
| | * Merge branch 'master' of github.com:rails/railsXavier Noria2010-12-151-1/+9
| | |\
| | | * test for eager load of has_one association with condition on the through tablePivotal Labs2010-12-151-1/+9
| | * | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-12-152-25/+25
| | |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 11:48:01 +0000