aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #32627 from jlduran/make-master-key-readable-only-by-ownerAndrew White2018-04-193-0/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | Make the master.key readable only by the ownerJose Luis Duran2018-04-193-0/+27
| |/ / / / / / /
* | | | | | | | Merge pull request #32633 from bogdanvlviv/fix-ref-in-actionpack-changelogRyuta Kamizono2018-04-191-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix reference to fixed issue in actionpack/CHANGELOG.mdbogdanvlviv2018-04-191-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #32613 from dsander/fix-as-timezone-allAndrew White2018-04-194-1/+35
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into fix-as-timezone-allAndrew White2018-04-1913-26/+155
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Redis cache store: avoid blocking the server in `#delete_matched`Gleb Mazovetskiy2018-04-182-6/+18
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #32607 from yaroslav/feature/nonce-for-javascript_include_tagAndrew White2018-04-184-0/+28
|\ \ \ \ \ \ \
| * | | | | | | Add the `nonce: true` option for `javascript_include_tag` helper.Yaroslav Markin2018-04-174-0/+28
* | | | | | | | Merge pull request #32326 from q-centrix/perf-improvement-translation-helper-...Guillermo Iguaran2018-04-181-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Only create an array with default options if we have default optionsDillon Welch2018-03-221-1/+5
* | | | | | | | | Remove unused literal introduced in #32602Andrew White2018-04-181-1/+0
* | | | | | | | | Don't link issue number in CHANGELOG [ci skip]Andrew White2018-04-181-1/+1
* | | | | | | | | Merge pull request #32602 from Envek/fix/csp-multiple-noncesAndrew White2018-04-183-13/+94
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Pass nonce to CSP policy from outsideAndrew White2018-04-183-53/+97
| * | | | | | | | | Output only one nonce in CSP header per requestAndrey Novikov2018-04-173-22/+59
* | | | | | | | | | Merge pull request #32616 from cassidycodes/validates-inclusion-exampleRyuta Kamizono2018-04-181-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update validates_inclusion_of exampleCassidy Kobewka2018-04-171-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #32612 from utilum/splat_actionviewRafael França2018-04-171-2/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Ruby 2.6 warning: passing splat keyword arguments as a single Hashutilum2018-04-171-2/+7
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #32611 from thoughtless/patch-1Rafael França2018-04-171-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Correct docs on naming of sprockets manifest filePaul2018-04-171-2/+2
|/ / / / / / / / /
| | | | * / / / / Fix exception in AS::Timezone.all when any tzinfo data is missingDominik Sander2018-04-184-1/+35
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge pull request #32556 from utilum/splatRyuta Kamizono2018-04-172-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | 2.6 warning: passing splat keyword arguments as a single Hashutilum2018-04-152-3/+3
* | | | | | | | | Merge pull request #32594 from utilum/structure_dump_create_tableRyuta Kamizono2018-04-171-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fix test to allow IF NOT EXISTS in structure:dumputilum2018-04-161-2/+2
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #32599 from eugeneius/rm_transaction_joinable_writerRyuta Kamizono2018-04-171-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unused attr_writer :joinable on TransactionEugene Kenny2018-04-171-1/+0
| | |_|/ / / / / | |/| | | | | |
* / | | | | | | ActionController -> Action Controller [ci skip]Xavier Noria2018-04-171-4/+5
|/ / / / / / /
* | | | | | | 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
|\ \ \ \ \ \