Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
| * | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2010-12-15 | 2 | -25/+25 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2010-12-15 | 12 | -171/+496 |
| |\ \ \ | | |_|/ | |/| | | |||||
| * | | | make sure that join nodes are uniq | Aaron Patterson | 2010-12-15 | 1 | -1/+1 |
| | | | | |||||
| * | | | Verify that creating a has_many through record where there is a ↵ | Jon Leighton | 2010-12-15 | 4 | -1/+22 |
| | | | | | | | | | | | | | | | | default_scope on the join model works correctly (creates the join record with the default scope applied) | ||||
| * | | | Respect the default_scope on a join model when reading a through association | Jon Leighton | 2010-12-15 | 8 | -4/+34 |
| | | | | |||||
| * | | | Fix edge cases for domain :all option on cookie store | brainopia | 2010-12-15 | 2 | -2/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dont set explicit domain for cookies if host is not a domain name [#6002 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | | | AppGenerator: use options instead of @options | Piotr Sarnacki | 2010-12-15 | 1 | -3/+3 |
| | | | | |||||
| * | | | Kill whitespace! | Piotr Sarnacki | 2010-12-15 | 1 | -3/+3 |
| | | | | |||||
| * | | | Generate default layout in engine with --mountable option | Piotr Sarnacki | 2010-12-15 | 4 | -2/+8 |
| | | | | |||||
| * | | | Fix generation of prototype files, it should work with --javascript ↵ | Piotr Sarnacki | 2010-12-15 | 3 | -2/+5 |
| | | | | | | | | | | | | | | | | prototype, not --prototype | ||||
| * | | | Generate javascripts in engine with --mountable option | Piotr Sarnacki | 2010-12-15 | 4 | -5/+70 |
| | | | | |||||
| * | | | Set proper engine's asset directories when assets are served from engine. | Piotr Sarnacki | 2010-12-15 | 2 | -0/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using stylesheet_link_tag(:all) or javascript_include_tag(:all), assets directories are searched for css or js files. When config.serve_static_assets is set to true, those files can be served directly from engine's directories. That's why assets paths should be set individually for controllers inside engine if we want to serve static assets with ActionDispatch::Static | ||||
| * | | | Should be isolated engine instead of namespaced engine | Piotr Sarnacki | 2010-12-15 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix hm:t to self table aliasing in construct_scope | Ernie Miller | 2010-12-14 | 3 | -3/+12 |
| | | | | |||||
| * | | | add test which fails for has_many through self join [#4361 state:open] | Joe Hannon | 2010-12-14 | 1 | -0/+7 |
| | | | | |||||
| * | | | class names are already strings, so we do not need to call to_s on the ↵ | Aaron Patterson | 2010-12-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | strings that are already strings | ||||
| * | | | build SQL AST nodes rather than generate strings | Aaron Patterson | 2010-12-14 | 1 | -10/+8 |
| | | | | |||||
| * | | | construct_joins no longer needs an argument | Aaron Patterson | 2010-12-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | supporting arel AST nodes when building join statements | Aaron Patterson | 2010-12-14 | 2 | -18/+32 |
| | | | | |||||
| * | | | just copy the joins to the list | Aaron Patterson | 2010-12-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | bucketing based on join type | Aaron Patterson | 2010-12-14 | 1 | -8/+17 |
| | | | | |||||
| * | | | taking advantage of the JoinSource node in the SQL AST | Aaron Patterson | 2010-12-14 | 4 | -32/+14 |
| | | | | |||||
| * | | | fixing whitespace errors | Aaron Patterson | 2010-12-14 | 1 | -4/+4 |
| | | | |