aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #32582 from cassidycodes/better-examplesRafael França2018-04-165-16/+16
|\
| * Use string-based fields. [ci skip]Cassidy Kobewka2018-04-162-5/+5
| * Inclusive Language in Documentation Examples [ci skip]Cassidy Kobewka2018-04-155-16/+16
* | Merge pull request #32596 from bogdanvlviv/add-reference-to-5_2-from-edge-guidesRyuta Kamizono2018-04-171-0/+1
|\ \
| * | Add the reference to Rails Guides 5.2 from the Edge Guidesbogdanvlviv2018-04-171-0/+1
* | | Merge pull request #32595 from jpawlyn/patch-1Rafael França2018-04-161-1/+1
|\ \ \ | |/ / |/| |
| * | Update Rails minor version from 5.1 to 5.2 [ci skip]Jolyon Pawlyn2018-04-161-1/+1
|/ /
* / Deprecate support for using `HOST` environment to specify server IP (#32540)Yuji Yaginuma2018-04-163-3/+35
|/
* Merge pull request #32573 from chloerei/fix-redis-store-clear-namespaceGeorge Claghorn2018-04-152-1/+19
|\
| * Fix redis store clear keys outside the namespaceRei2018-04-152-1/+19
* | Merge pull request #32576 from r7kamura/require-benchmarkAndrew White2018-04-141-0/+1
|\ \ | |/ |/|
| * Add missing `require "benchmark"`r7kamura2018-04-151-0/+1
|/
* Merge pull request #32566 from chrisarcand/fix-broken-nodocsRafael França2018-04-133-3/+3
|\
| * Fix broken nodocsChris Arcand2018-04-133-3/+3
* | Merge pull request #32553 from raderj89/jaredrader/update-docs-ActiveJob__Ser...Rafael França2018-04-131-1/+1
|\ \ | |/ |/|
| * fix spelling in docs for ActiveJob::Serializers::ObjectSerializer#deserializeJared Rader2018-04-131-1/+1
* | Fix rendering a differently-formatted partial after cachingGeorge Claghorn2018-04-134-2/+26
* | Merge pull request #32561 from TheAssailant/storage-keep-gitignoreGeorge Claghorn2018-04-131-1/+4
|\ \
| * | Add .keep exception for storage folderPaul2018-04-131-1/+4
* | | Merge pull request #32562 from szTheory/patch-1 [ci skip]Guillermo Iguaran2018-04-131-1/+1
|\ \ \
| * | | Update security.md with latest underground market pricesszTheory2018-04-131-1/+1
| |/ /
* / / couple of edits [ci skip]Xavier Noria2018-04-131-2/+2
|/ /
* / Use `SecureRandom.random_bytes` instead of `SecureRandom.bytes`yuuji.yaginuma2018-04-131-1/+1
|/
* Fix database.yml mergingeileencodes2018-04-121-1/+1
* Merge pull request #32549 from stephensolis/csp-websocketsRafael França2018-04-122-1/+9
|\
| * Add WebSocket URI support to CSP DSL mappingsStephen Solis2018-04-122-1/+9
* | Merge pull request #32551 from chrisarcand/no-doc-original-sumRafael França2018-04-121-1/+1
|\ \
| * | Don't doc _original_sum_with_required_identityChris Arcand2018-04-121-1/+1
| |/
* | Merge pull request #32539 from chancancode/anticompressRafael França2018-04-125-73/+181
|\ \ | |/ |/|
| * Fix `ActiveSupport::Cache` compressionGodfrey Chan2018-04-113-37/+60
| * Add failing test for compression bugGodfrey Chan2018-04-113-38/+123
* | Merge pull request #32542 from teddywing/active-support-cache-store--fix-end-...George Claghorn2018-04-121-2/+3
|\ \
| * | Cache::Store#read: Fix fixed-width end tag in docsTeddy Wing2018-04-121-2/+3
* | | Merge pull request #31913 from rywall/define-callbacks-descMatthew Draper2018-04-122-1/+13
|\ \ \ | |/ / |/| |
| * | No need to define methods on descendants.Ryan Wallace2018-02-241-18/+18
| * | Define callbacks on descendants.Ryan Wallace2018-02-062-17/+29
* | | Merge pull request #32538 from 284km/fix_guides_security_linkRafael França2018-04-121-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix MySpace Samy worm link [ci skip]284km2018-04-121-1/+1
|/ /
* | Merge pull request #32536 from lsylvester/fix-immutable-relation-error-with-h...Rafael França2018-04-113-3/+12
|\ \
| * | don't check for immutability when setting skip_preloading as it doesn't effec...Lachlan Sylvester2018-04-123-3/+12
|/ /
* | Merge pull request #32527 from nsgc/use_frozen_string_literalRafael França2018-04-111-0/+2
|\ \
| * | Use frozen string literalNaoki Nishiguchi2018-04-111-0/+2
* | | Remove link for the kindle version of guides on edgeRafael Mendonça França2018-04-111-1/+3
|/ /
* | Unlock dalli versionyuuji.yaginuma2018-04-112-3/+3
* | Merge pull request #32496 from yhirano55/fix_turbolinks_warning_in_railtiesRafael França2018-04-101-3/+3
|\ \
| * | Fix turbolinks warning in railties testYoshiyuki Hirano2018-04-111-3/+3
* | | Merge pull request #32484 from kddeisz/default-headersRafael França2018-04-105-6/+24
|\ \ \
| * | | Include default headers by default in API modeKevin Deisz2018-04-065-6/+24
* | | | Specify which series I'm talking aboutRafael Mendonça França2018-04-101-1/+1
* | | | Update our security policy to include all releases in the current seriesRafael Mendonça França2018-04-101-2/+2