aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Passing subdomain: '' to url_for removes the subdomain (instead of adding a l...Derek Watson2013-04-184-1/+32
* Merge pull request #10262 from printercu/patch-3Rafael Mendonça França2013-04-182-0/+7
|\
| * Avoid leak into controller's action_methodsprintercu2013-04-182-0/+7
|/
* Merge pull request #10258 from thenickcox/pending_migrations_pluralRafael Mendonça França2013-04-181-3/+3
|\
| * Fix subject-verb agreement in error msg (and other grammar stuff)thenickcox2013-04-171-3/+3
* | Merge pull request #10259 from prathamesh-sonpatki/secure-engine-testsCarlos Antonio da Silva2013-04-171-1/+1
|\ \
| * | Use secure source for rubygems in engine testsPrathamesh Sonpatki2013-04-181-1/+1
|/ /
* | Merge pull request #10255 from wangjohn/increment_or_decrement_refactoring_in...Carlos Antonio da Silva2013-04-171-18/+14
|\ \
| * | The increment and decrement commands in the local cache are exactly thewangjohn2013-04-171-18/+14
|/ /
* | Merge pull request #10254 from wangjohn/refactoring_local_cacheCarlos Antonio da Silva2013-04-171-8/+6
|\ \
| * | Refactored the storage of a temporary version of the local cache intowangjohn2013-04-171-8/+6
|/ /
* | activerecord-deprecated_finders 1.0.0 has a bug with has_many :throughRafael Mendonça França2013-04-171-1/+1
* | Merge pull request #10252 from epiclabs/nodoc_registriesRafael Mendonça França2013-04-172-4/+4
|\ \
| * | add :nodoc: mark to *Registry classes [ci skip]Francesco Rodriguez2013-04-173-5/+5
* | | Add nodoc to LocalCacheRegistryRafael Mendonça França2013-04-171-1/+1
|/ /
* | Merge pull request #10250 from wangjohn/local_cache_registryRafael Mendonça França2013-04-171-15/+32
|\ \
| * | Adding a local thread registry to store local caches.wangjohn2013-04-171-15/+32
* | | adding a test for root path in the appAaron Patterson2013-04-171-0/+24
|/ /
* | Don't need to add activerecord-deprecated_finders on edge and devRafael Mendonça França2013-04-171-3/+1
* | Bump activerecord-deprecated_finders to 1.0.0Rafael Mendonça França2013-04-171-1/+1
* | Merge pull request #10249 from shime/descriptive_error_messagesPiotr Sarnacki2013-04-172-6/+8
|\ \
| * | more descriptive NameError's messages for class attributesHrvoje Šimić2013-04-172-6/+8
|/ /
* | Merge pull request #10239 from rubys/cache_entry_conversion_problemsJeremy Kemper2013-04-162-52/+51
|\ \
| * | switch (and lazily convert) ivar names to 3.xSam Ruby2013-04-162-52/+51
* | | Merge pull request #10173 from nashby/element-attributesRafael Mendonça França2013-04-163-1/+13
|\ \ \
| * | | options_from_collection_for_select helper takes html attributesVasiliy Ermolovich2013-04-113-1/+13
* | | | let EXPLAIN use a thread locals registry [John J. Wang & Xavier Noria]Xavier Noria2013-04-165-46/+70
| |/ / |/| |
* | | fixes gemspecXavier Noria2013-04-161-1/+1
* | | Merge pull request #8206 from kennyj/fix_7619-2Rafael Mendonça França2013-04-163-3/+15
|\ \ \
| * | | Fix #7619. 0x prefix must be added when assigning hexadecimal string into bit...kennyj2013-04-173-3/+15
|/ / /
* | | Ruby On Rails -> Ruby on Rails [ci skip]Xavier Noria2013-04-161-1/+1
* | | Copy-edits in the ActiveSupport::Subscriber documentation.Rafael Mendonça França2013-04-161-6/+5
* | | Merge pull request #10218 from dasch/dasch/extract-subscriber-classRafael Mendonça França2013-04-163-43/+89
|\ \ \
| * | | Extract a base class from ActiveSupport::LogSubscriberDaniel Schierbeck2013-04-163-43/+89
* | | | editorial touch, remove these dotsXavier Noria2013-04-161-4/+4
* | | | converts the project README to MarkdownXavier Noria2013-04-162-77/+78
* | | | Merge pull request #10230 from gaurish/remove-matchRafael Mendonça França2013-04-151-1/+1
|\ \ \ \
| * | | | replace match with get verb in ActionController::MetalGaurish Sharma2013-04-161-1/+1
|/ / / /
* | | | The third argument of deprecation_warning is always optionalRafael Mendonça França2013-04-161-1/+1
* | | | Fix documentation to the custom DeprecatorRafael Mendonça França2013-04-161-1/+1
* | | | Merge pull request #10228 from prathamesh-sonpatki/AR-TyposCarlos Antonio da Silva2013-04-151-4/+4
|\ \ \ \
| * | | | Fixed typos in AR CHANGELOGPrathamesh Sonpatki2013-04-161-4/+4
|/ / / /
* | | | Use db:test:load instead of db:test:load_schemaPiotr Sarnacki2013-04-161-1/+1
* | | | Merge pull request #10226 from buddhamagnet/masterRafael Mendonça França2013-04-151-1/+3
|\ \ \ \
| * | | | make [] method in router more readablebuddhamagnet2013-04-151-1/+3
|/ / / /
* | | | Merge pull request #10225 from kennyj/fix_bit_string_problemRafael Mendonça França2013-04-153-5/+22
|\ \ \ \
| * | | | Add OID::Bit for supporting bit string.kennyj2013-04-162-2/+19
| * | | | Revert "fixing bit string test"kennyj2013-04-161-3/+3
|/ / / /
* | | | Merge pull request #10178 from rubys/app_base_strip_heredocRafael Mendonça França2013-04-151-14/+12
|\ \ \ \
| * | | | Use strip_heredoc where possibleSam Ruby2013-04-111-14/+12