aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \
| * \ \ Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-12-1512-171/+496
| |\ \ \ | | |_|/ | |/| |
| * | | make sure that join nodes are uniqAaron Patterson2010-12-151-1/+1
| * | | Verify that creating a has_many through record where there is a default_scope...Jon Leighton2010-12-154-1/+22
| * | | Respect the default_scope on a join model when reading a through associationJon Leighton2010-12-158-4/+34
| * | | Fix edge cases for domain :all option on cookie storebrainopia2010-12-152-2/+26
| * | | AppGenerator: use options instead of @optionsPiotr Sarnacki2010-12-151-3/+3
| * | | Kill whitespace!Piotr Sarnacki2010-12-151-3/+3
| * | | Generate default layout in engine with --mountable optionPiotr Sarnacki2010-12-154-2/+8
| * | | Fix generation of prototype files, it should work with --javascript prototype...Piotr Sarnacki2010-12-153-2/+5
| * | | Generate javascripts in engine with --mountable optionPiotr Sarnacki2010-12-154-5/+70
| * | | Set proper engine's asset directories when assets are served from engine.Piotr Sarnacki2010-12-152-0/+72
| * | | Should be isolated engine instead of namespaced enginePiotr Sarnacki2010-12-151-1/+1
| * | | Fix hm:t to self table aliasing in construct_scopeErnie Miller2010-12-143-3/+12
| * | | add test which fails for has_many through self join [#4361 state:open]Joe Hannon2010-12-141-0/+7
| * | | class names are already strings, so we do not need to call to_s on the string...Aaron Patterson2010-12-141-2/+2
| * | | build SQL AST nodes rather than generate stringsAaron Patterson2010-12-141-10/+8
| * | | construct_joins no longer needs an argumentAaron Patterson2010-12-141-1/+1
| * | | supporting arel AST nodes when building join statementsAaron Patterson2010-12-142-18/+32
| * | | just copy the joins to the listAaron Patterson2010-12-141-1/+1
| * | | bucketing based on join typeAaron Patterson2010-12-141-8/+17
| * | | taking advantage of the JoinSource node in the SQL ASTAaron Patterson2010-12-144-32/+14
| * | | fixing whitespace errorsAaron Patterson2010-12-141-4/+4
| * | | Fix indentation and newlines in generated enginePiotr Sarnacki2010-12-142-2/+2
| * | | stop delegating inserts to ARel, use the INSERT SQL ourselvesAaron Patterson2010-12-131-1/+13
| * | | persisted? should be able to return a truthy objectAaron Patterson2010-12-131-8/+8