aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Allow rubocop check more filesbogdanvlviv2018-04-196-13/+13
* Merge pull request #32401 from yhirano55/improve_css_in_guideRafael França2018-04-192-12/+2
|\
| * Improve css in guideYoshiyuki Hirano2018-04-012-12/+2
* | Merge pull request #32636 from yhirano55/improve_line_tasksRafael França2018-04-192-2/+2
|\ \
| * | Improve redundancy in line tasksYoshiyuki Hirano2018-04-192-2/+2
* | | [ci skip] Restore of links in RDOC_MAIN after an update of the file (#32644)Felipe Tovar2018-04-191-11/+11
* | | Merge pull request #32593 from sdhull/fix-strong-params-permit-bangRafael Mendonça França2018-04-192-2/+5
|\ \ \
| * | | Fixes StrongParameters permit! to work with nested arraysSteve Hull2018-04-163-2/+12
* | | | Merge pull request #32605 from composerinteralia/assert-notRafael França2018-04-19104-338/+429
|\ \ \ \
| * | | | Replace `assert !` with `assert_not`Daniel Colson2018-04-1998-328/+328
| * | | | Add RuboCop for `assert_not` over `assert !`Daniel Colson2018-04-196-10/+101
* | | | | Merge pull request #32637 from yhirano55/add_exclude_condition_in_rubocopRafael França2018-04-191-0/+1
|\ \ \ \ \
| * | | | | Add exculude condition in rubocop.ymlYoshiyuki Hirano2018-04-201-0/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #32638 from yhirano55/navigate_edgeguide_from_github_templateRafael França2018-04-192-2/+2
|\ \ \ \ \
| * | | | | Navigate edgeguide from .github template [ci skip]Yoshiyuki Hirano2018-04-202-2/+2
| |/ / / /
* | | | | [ci skip] Remove style of the word Rails at the topGuillermo Iguaran2018-04-191-1/+1
* | | | | Merge pull request #32626 from ftovaro/masterXavier Noria2018-04-192-40/+54
|\ \ \ \ \
| * | | | | [ci skip] Remove style of the word Rails at the topFelipe Tovar2018-04-191-1/+1
| * | | | | [ci skip] Missing \ in RDOC_MAINFelipe Tovar2018-04-190-0/+0
| |\ \ \ \ \
| | * | | | | [ci skip] update RDOC_MAINFelipe Tovar2018-04-191-23/+30
| * | | | | | [ci skip] update RDOC_MAINFelipe Tovar2018-04-191-23/+30
| |/ / / / /
| * | | | | Update READMEFelipe Tovar2018-04-181-18/+25
* | | | | | Merge pull request #32635 from yhirano55/update_cocGuillermo Iguaran2018-04-191-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Update CoC to change a history of updates URL [ci skip]Yoshiyuki Hirano2018-04-191-1/+1
|/ / / / /
* | | | | Merge pull request #32625 from stephendolan/masterKasper Timm Hansen2018-04-191-1/+1
|\ \ \ \ \
| * | | | | [ci skip] Fix minor system testing documentation typo.Stephen2018-04-181-1/+1
* | | | | | 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
|\ \ \ \ \ \