aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8162 from fimmtiu/masterRafael Mendonça França2012-11-091-2/+2
|\
| * Trivial documentation fix for ActiveModel::Naming comment.Dennis Taylor2012-11-091-2/+2
|/
* Use get in the redirection doc examplesCarlos Antonio da Silva2012-11-091-7/+7
* Gracefully handle upgrading apps with mass assigment configsAndrew White2012-11-091-0/+27
* Merge pull request #8158 from steveklabnik/deprecate_diffCarlos Antonio da Silva2012-11-093-3/+5
|\
| * Deprecate Hash#diff.Steve Klabnik2012-11-093-3/+5
* | Remove not used load hooks for active_record_configCarlos Antonio da Silva2012-11-092-6/+0
* | fix warningsJon Leighton2012-11-091-1/+1
* | Properly deprecate ConnectionHandler#connection_poolsJon Leighton2012-11-093-8/+22
* | Merge pull request #8157 from steveklabnik/remove_callback_duplicationRafael Mendonça França2012-11-091-7/+8
|\ \
| * | Removing duplication in callback normalization.Steve Klabnik2012-11-091-7/+8
| |/
* | Merge pull request #8116 from senny/7993_configure_counter_cache_for_has_manyJon Leighton2012-11-096-2/+19
|\ \
| * | :counter_cache option for to support custom named counter caches. Closes #7993Yves Senn2012-11-046-2/+19
* | | Delegate all calculations to the scope.Jon Leighton2012-11-093-4/+7
* | | CollectionProxy#pluck issues no query for a new_record? ownerJon Leighton2012-11-092-0/+5
* | | Nullify the relation at a more general level.Jon Leighton2012-11-093-7/+14
| |/ |/|
* | Merge pull request #8151 from nashby/forwardableCarlos Antonio da Silva2012-11-091-20/+2
|\ \
| * | delegate PathSet's enumerator methodsVasiliy Ermolovich2012-11-091-20/+2
* | | Merge pull request #8153 from steveklabnik/fix_include_blankCarlos Antonio da Silva2012-11-091-1/+1
|\ \ \
| * | | Fix message about include_blank option.Steve Klabnik + Katrina Owen2012-11-091-1/+1
* | | | Relations built off collection associations with an unsaved owner should be n...Jon Leighton2012-11-092-2/+12
* | | | Merge pull request #8152 from steveklabnik/squashing_guideXavier Noria2012-11-091-0/+38
|\ \ \ \ | |/ / / |/| | |
| * | | Add note about squashing in contributor guide.Steve Klabnik + Katrina Owen2012-11-091-0/+38
|/ / /
* | | implement to_a and to_ary so that the Array() call in template.rb willAaron Patterson2012-11-091-9/+14
* | | make the extremely useful logs debug levelAaron Patterson2012-11-091-2/+2
* | | copy the log level from the config settingsAaron Patterson2012-11-091-0/+1
* | | Merge pull request #7763 from route/full-captureCarlos Antonio da Silva2012-11-083-11/+29
|\ \ \
| * | | Kernel#capture replaced by version which can catch output from subprocessesDmitry Vorotilin2012-11-013-11/+29
* | | | rm dead codeAaron Patterson2012-11-091-1/+1
* | | | Merge pull request #8147 from gbchaosmaster/gemspecRafael Mendonça França2012-11-087-69/+83
|\ \ \ \
| * | | | Clean up gemspecsVinny Diehl2012-11-087-69/+83
* | | | | Revert "Merge pull request #8017 from jcoglan/objectless_sessions"Jon Leighton2012-11-093-47/+10
* | | | | Remove free usage of #tapCarlos Antonio da Silva2012-11-081-3/+4
* | | | | Merge pull request #8017 from jcoglan/objectless_sessionsJon Leighton2012-11-083-10/+46
|\ \ \ \ \
| * | | | | Store FlashHashes in the session as plain hashes rather than custom objects w...James Coglan2012-11-033-10/+46
* | | | | | Merge pull request #8115 from senny/7842_handle_trailing_slash_with_enginesRafael Mendonça França2012-11-082-3/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | routing prefix slash replacement is no longer necessaryYves Senn2012-11-041-3/+1
| * | | | | test case to lock down the behavior of #7842Yves Senn2012-11-041-0/+5
* | | | | | Merge pull request #8145 from sobrinho/masterRafael Mendonça França2012-11-081-0/+11
|\ \ \ \ \ \
| * | | | | | Add test to avoid regression of 58e48d5292242f000dc8a87fdbb1c0ccdcf286d8Gabriel Sobrinho & Ricardo Henrique2012-11-081-0/+11
* | | | | | | Add CHANGELOG entry for #8108 on master too.Rafael Mendonça França2012-11-081-0/+16
|/ / / / / /
* | | | | | Merge pull request #8139 from senny/8121_engine_generator_rakefile_without_te...Carlos Antonio da Silva2012-11-084-3/+18
|\ \ \ \ \ \
| * | | | | | `plugin new` adds dummy app tasks when necessary.Yves Senn2012-11-084-3/+18
|/ / / / / /
* | | | | | Remove not used indifferent_access requires from Base and FinderMethodsCarlos Antonio da Silva2012-11-072-3/+0
* | | | | | Use cached quoted_table_name instead of going through the connectionCarlos Antonio da Silva2012-11-071-1/+1
* | | | | | Remove block given check from private find_with_idsCarlos Antonio da Silva2012-11-071-2/+0
| |_|_|/ / |/| | | |
* | | | | Fix guides home links and maintain compatibility with small screensCarlos Antonio da Silva2012-11-071-1/+7
* | | | | Do not strip code blocks, otherwise we may get misaligned outputCarlos Antonio da Silva2012-11-071-1/+1
* | | | | stop raising so many exceptionsAaron Patterson2012-11-071-1/+5
* | | | | adding requires for constant dependenciesAaron Patterson2012-11-072-0/+6