aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | Merge pull request #26157 from y-yagi/remove_test_mailers_when_skipping_actio...Rafael França2016-08-162-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | remove "test/mailers" directory when skipping action-maileryuuji.yaginuma2016-08-142-0/+2
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #26130 from yui-knk/drop_tableRafael França2016-08-161-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Drop a temporary table before end of a test caseyui-knk2016-08-141-1/+3
* | | | | | | | | | | | | | | | | | | Add three new rubocop rulesRafael Mendonça França2016-08-16362-1797/+1809
* | | | | | | | | | | | | | | | | | | Merge pull request #26177 from achinn/ac-live-deadlockMatthew Draper2016-08-163-1/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix deadlock that can occur when child live thread tries to load a constant a...Alex Chinn2016-08-153-1/+30
* | | | | | | | | | | | | | | | | | | | Merge pull request #26178 from claudiob/load-table-metadataRafael França2016-08-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Eager autoload ActiveRecord::TableMetadataclaudiob2016-08-151-1/+1
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #26176 from stomar/clarify-update-taskVipul A M2016-08-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Clarify use of update task on 4.2 and earlier [ci skip]Marcus Stollsteimer2016-08-151-1/+1
| | |_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #26167 from kamipo/remove_find_nth_with_limit_and_offsetKasper Timm Hansen2016-08-151-34/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Remove `find_nth_with_limit_and_offset` private methodRyuta Kamizono2016-08-151-34/+13
* | | | | | | | | | | | | | | | | | | | Merge pull request #26170 from eugeneius/rm_log_subscriber_odd_ivarKasper Timm Hansen2016-08-151-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Remove odd ivar from ActiveRecord::LogSubscriberEugene Kenny2016-08-151-5/+0
* | | | | | | | | | | | | | | | | | | | Merge pull request #26160 from prathamesh-sonpatki/use-encoding-from-metalMatthew Draper2016-08-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | AC::Metal is already defining default encoding as UTF 8, let's reuse it.Prathamesh Sonpatki2016-08-141-1/+1
| | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #25570 from y-yagi/remove_useless_parameterEileen M. Uchitelle2016-08-151-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | remove useless parameteryuuji.yaginuma2016-06-291-4/+4
* | | | | | | | | | | | | | | | | | | | | Merge pull request #26168 from chuckdishmon/fix-plural-usageJon Moss2016-08-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | fix usage of pluralized wordchuckdishmon2016-08-141-1/+1
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge pull request #26166 from kamipo/fix_ar_fixtures_docJon Moss2016-08-141-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Fix `ActiveRecord::FixtureSet` docs [ci skip]Ryuta Kamizono2016-08-151-4/+4
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Revert "Clarify and fix typos in Autoloading Disabled upgrade guide [ci skip]"Xavier Noria2016-08-151-12/+12
* | | | | | | | | | | | | | | | | | | | Merge pull request #26150 from kamipo/consolidate_ar_test_case_and_as_test_caseSean Griffin2016-08-143-21/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Consolidate `ActiveRecord::TestCase` and `ActiveSupport::TestCase` in AR test...Ryuta Kamizono2016-08-143-21/+20
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Pass along original attribute to save later recursionAaron Patterson2016-08-142-1/+8
* | | | | | | | | | | | | | | | | | | Merge pull request #26012 from grosser/grosser/missingSean Griffin2016-08-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | add index to array methods so we can call it on relationsMichael Grosser2016-08-121-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #26163 from olivierlacan/clarify-autoloading-disabledJon Moss2016-08-141-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Clarify and fix typos in Autoloading Disabled upgrade guide [ci skip]Olivier Lacan2016-08-141-12/+12
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | [ci skip] Link to the request helpers documentation.Kasper Timm Hansen2016-08-141-0/+3
* | | | | | | | | | | | | | | | | | | [ci skip] Update integration test request encoding documentation.Kasper Timm Hansen2016-08-141-13/+14
* | | | | | | | | | | | | | | | | | | Merge pull request #26159 from prathamesh-sonpatki/fix-cache-logging-docKasper Timm Hansen2016-08-141-8/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix the documentation for configuring `enable_fragment_cache_logging` [ci skip]Prathamesh Sonpatki2016-08-141-8/+16
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #26146 from bcardarella/bc-clean-up-action-mailer-dirsRafael França2016-08-132-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Ensure app/mailers is removed when skipping action-mailerBrian Cardarella2016-08-122-0/+2
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #25856 from mrageh/improve-lazy-load-hook-docsRafael França2016-08-121-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Add documentation about `ActiveSupport.on_load`mrageh2016-08-131-0/+2
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #26113 from kamipo/use_ar_test_case_instead_of_as_test_caseRafael França2016-08-122-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Use `ActiveRecord::TestCase` rather than `ActiveSupport::TestCase` in AR test...Ryuta Kamizono2016-08-112-2/+2
| | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #26143 from nathanl/self-explanatory-cache-durationsRafael França2016-08-122-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Make cache max-age durations self-explanatoryNathan Long2016-08-122-2/+2
* | | | | | | | | | | | | | | | | | | Merge pull request #26100 from vipulnsward/changelogsRafael França2016-08-126-13/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Pass over changelogs [ci skip]Vipul A M2016-08-106-13/+16
* | | | | | | | | | | | | | | | | | | | Make private method privateRafael Mendonça França2016-08-121-11/+11
* | | | | | | | | | | | | | | | | | | | Mark method as nodocRafael Mendonça França2016-08-121-3/+3
* | | | | | | | | | | | | | | | | | | | Merge pull request #26144 from javierjulio/patch-1Jon Moss2016-08-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Given a hash (Rails 5) .from_hash must be usedJavier Julio2016-08-121-1/+1
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #26133 from smellsblue/dont-fail-on-non-stringRafael França2016-08-122-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \