aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #8173 from nikitug/match_classes_without_to_sCarlos Antonio da Silva2012-11-111-10/+10
|\ \ \ \ \ \
| * | | | | | Match classes without to_s conversions.Nikita Afanasenko2012-11-111-10/+10
* | | | | | | Merge pull request #8172 from nikitug/silent_diff_deprecationSantiago Pastorino2012-11-111-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Test Hash#diff deprecation, also prevent deprecation message in AS testsNikita Afanasenko2012-11-111-1/+3
| |/ / / / / /
* | | | | | | Merge pull request #8170 from arunagw/warning_removed_railtiesSantiago Pastorino2012-11-111-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Removing warning : ambiguous first argumentArun Agrawal2012-11-111-2/+2
|/ / / / / /
* / / / / / Make ActiveRecord::Delegation#method_missing threadsafeJon Leighton2012-11-101-3/+21
|/ / / / /
* | | | | recent railties changes added to the release notes [ci skip]Vijay Dev2012-11-101-0/+39
* | | | | update turbolinks readme link [ci skip]Vijay Dev2012-11-101-2/+2
* | | | | Merge pull request #8165 from arunagw/warning_removed_unused_variablesCarlos Antonio da Silva2012-11-102-2/+2
|\ \ \ \ \
| * | | | | Removing warning : assigned but unused variableArun Agrawal2012-11-102-2/+2
* | | | | | Merge pull request #8154 from bogdan/has_one_association_performanceCarlos Antonio da Silva2012-11-103-1/+24
|\ \ \ \ \ \
| * | | | | | Do not create useless database transaction when building `has_one` association.Bogdan Gusiev2012-11-103-1/+24
|/ / / / / /
* | | | | | Merge pull request #8164 from nikitug/keep_serialization_in_its_moduleCarlos Antonio da Silva2012-11-102-9/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Keep the code related to serialization in Serialization module.Nikita Afanasenko2012-11-102-9/+13
|/ / / / /
* | | | | 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
| | |_|_|_|_|_|_|/ | |/| | | | | | |