aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7240 from steveklabnik/fix_2301Rafael Mendonça França2012-08-023-4/+7
|\
| * Changelog entry for Digest Auth fix (#2301)Steve Klabnik2012-08-021-0/+2
| * Fix for digest authentication bug - issue #2301 in rails/railsArthur Smith2012-08-022-4/+5
* | load active_support/deprecation in active_support/railsXavier Noria2012-08-0220-19/+4
* | load active_support/core_ext/module/delegation in active_support/railsXavier Noria2012-08-0217-16/+3
* | load active_support/core_ext/class/attribute in active_support/railsXavier Noria2012-08-0232-34/+6
* | load active_support/concern in active_support/railsXavier Noria2012-08-0217-16/+3
* | load active_support/dependencies/autoload in active_support/railsXavier Noria2012-08-023-2/+3
* | load active_support/core_ext/object/inclusion in active_support/railsXavier Noria2012-08-0226-25/+4
* | load active_support/core_ext/object/blank in active_support/railsXavier Noria2012-08-0255-54/+2
* | defines a private require-hub active_support/railsXavier Noria2012-08-028-0/+16
* | Check validity of options[:as] just onceJosé Valim2012-08-021-12/+18
* | Merge pull request #7129 from kennyj/fix_7079José Valim2012-08-022-7/+19
|\ \ | |/ |/|
| * Improve error handling when using partial name with hyphen. Fix #7079kennyj2012-08-032-7/+19
* | Fix tests.Rafael Mendonça França2012-08-021-2/+2
* | Do not consider the numeric attribute as changed if the old value isRafael Mendonça França2012-08-022-2/+15
|/
* s/scoped/scope/Jon Leighton2012-08-019-27/+33
* Add CollectionProxy#scopeJon Leighton2012-08-013-1/+30
* Use explicit delegationsJon Leighton2012-08-011-119/+79
* Refactor a bitJon Leighton2012-08-011-38/+37
* Add `Relation#load`Jon Leighton2012-08-013-2/+35
* Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql.Jon Leighton2012-08-019-45/+118
* Revert "Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql."Jon Leighton2012-08-0115-84/+339
* Merge pull request #7217 from freerobby/no_password_requirement_if_validation...Carlos Antonio da Silva2012-08-013-2/+21
|\
| * has_secure_password should not raise a 'digest missing' error if the calling ...Robby Grossman2012-07-313-2/+21
* | Merge pull request #7228 from kennyj/move_to_ar2Carlos Antonio da Silva2012-08-011-1/+1
|\ \
| * | Change AR's CHANGELOG, because it is related to e35c67ae0f920011a2440210041e9...kennyj2012-08-021-1/+1
|/ /
* | Merge pull request #7224 from kennyj/move_to_arJosé Valim2012-08-012-17/+22
|\ \
| * | The use_schema_cache_dump configuration moved to ActiveRecord.kennyj2012-08-022-17/+22
* | | Merge branch 'refactor-dependency-check'Carlos Antonio da Silva2012-08-014-21/+23
|\ \ \
| * | | Refactor dependency check validationCarlos Antonio da Silva2012-08-014-28/+19
| * | | move method for dependent option checkHrvoje Šimić2012-08-014-11/+22
| | |/ | |/|
* | | Merge pull request #7219 from jmazzi/masterRafael Mendonça França2012-08-011-0/+11
|\ \ \ | | |/ | |/|
| * | Restoring documentation for env_config per #7070Justin Mazzi2012-08-011-0/+11
|/ /
* | Merge pull request #7147 from pferdefleisch/scaffold_controller_docsRafael Mendonça França2012-07-311-4/+3
|\ \
| * | Updated scaffold_controller generator docs #7146Aaron Cruz2012-07-311-4/+3
|/ /
* | Merge pull request #7204 from frodsan/update_conventionsRafael Mendonça França2012-07-311-8/+8
|\ \
| * | update coding conventions in metal/liveFrancesco Rodriguez2012-07-301-8/+8
* | | html_escape should escape single quotesSantiago Pastorino2012-07-3110-30/+30
| |/ |/|
* | Merge pull request #7212 from accessd/small-typo-fixRafael Mendonça França2012-07-311-1/+1
|\ \
| * | fix typo in collection proxyAccessd2012-07-311-1/+1
|/ /
* | Update activesupport/CHANGELOG.mdJosé Valim2012-07-311-0/+2
* | Merge pull request #7197 from davidcelis/i18n_inflectorJosé Valim2012-07-316-25/+84
|\ \
| * | Make ActiveSupport::Inflector locale aware and multilingualDavid Celis2012-07-306-25/+84
* | | Merge pull request #7176 from bogdan/reverse_orderRafael Mendonça França2012-07-319-17/+35
|\ \ \
| * | | AR::Relation#order: make new order prepend old oneBogdan Gusiev2012-07-319-17/+35
|/ / /
* | | Merge pull request #7205 from frodsan/fix_nodoc_liveCarlos Antonio da Silva2012-07-301-4/+4
|\ \ \ | |_|/ |/| |
| * | fix nodoc in metal/liveFrancesco Rodriguez2012-07-301-4/+4
|/ /
* | Merge pull request #7203 from frodsan/typo_liveRafael Mendonça França2012-07-301-6/+6
|\ \
| * | fix typo in metal/live [ci skip]Francesco Rodriguez2012-07-301-6/+6
|/ /