aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into clear_all_environments_log_by_defaultRafael França2016-12-29100-588/+816
|\
| * Fix Rubocop violations and fix documentation visibilityRafael Mendonça França2016-12-281-38/+38
| * Add backticks to show shell commandJon Moss2016-12-271-2/+2
| * Remove random extra spaces from Action Pack and Railties CHANGELOG.mdJon Moss2016-12-271-2/+2
| * assert_equal takes expectation firstAkira Matsuda2016-12-261-1/+1
| * Correct indent-accounting in controller route generationMatthew Draper2016-12-252-12/+15
| * "Use assert_nil if expecting nil. This will fail in minitest 6."Akira Matsuda2016-12-255-8/+8
| * Privatize unneededly protected methods in RailtiesAkira Matsuda2016-12-2525-135/+136
| * Privatize some methods that were originally protectedAkira Matsuda2016-12-251-25/+27
| * Prefer class << self; def over def self.Akira Matsuda2016-12-251-200/+200
| * `protected` here doesn't protect anythingAkira Matsuda2016-12-251-26/+25
| * Privatize unneededly protected methods in Railties testsAkira Matsuda2016-12-246-6/+6
| * Describe what we are protectingAkira Matsuda2016-12-232-0/+4
| * quiet generators log in testyuuji.yaginuma2016-12-221-1/+1
| * Limit length of secret being passedJon Moss2016-12-201-3/+3
| * `ARGV.shift` before calling Rails generatorsJon Moss2016-12-172-0/+17
| * Remove unused method `namespaced_file_path`Fumiaki MATSUSHIMA2016-12-141-4/+0
| * use appropriate type for `rc` optionyuuji.yaginuma2016-12-141-1/+1
| * Merge pull request #27042 from kirs/yaml-schema-cacheRafael França2016-12-131-2/+2
| |\
| | * Use YAML to serialize schema cacheKir Shatrov2016-11-271-2/+2
| * | Don't assign a default to `webpack`.Kasper Timm Hansen2016-12-121-2/+2
| * | Add option to trigger JS framework-specific installation as part of webpack s...David Heinemeier Hansson2016-12-122-2/+17
| * | Oops!Akira Matsuda2016-12-121-1/+1
| * | :nail_care:Akira Matsuda2016-12-121-2/+2
| * | run `webpack` command only when webpack option is specifiedyuuji.yaginuma2016-12-101-1/+1
| * | gemfile entry method need to return an empty array rather than nil (#27318)Yuji Yaginuma2016-12-091-4/+4
| * | Use GitHub webpacker until closer to releaseDavid Heinemeier Hansson2016-12-091-1/+1
| * | Basic --webpack delegation to new webpacker gem (#27288)David Heinemeier Hansson2016-12-092-1/+16
| * | Show message if Yarn is not installed (#27312)Guillermo Iguaran2016-12-091-1/+8
| * | Only have Yarn bundling commented out as we cant be sure Yarn is installedDavid Heinemeier Hansson2016-12-082-5/+2
| * | Fix ability to run railties test suiteDavid Heinemeier Hansson2016-12-081-0/+1
| * | fix broken tests (#27308)Yuji Yaginuma2016-12-081-3/+2
| * | specify `skip_yarn` option in API-only Application (#27309)Yuji Yaginuma2016-12-082-3/+12
| * | Merge pull request #25051 from bf4/extract_notes_as_binarySean Griffin2016-12-081-1/+1
| |\ \
| | * | Extract notes from files in binaryBenjamin Fleischer2016-09-051-1/+1
| * | | Make Yarn the default, drop default vendor/asset directories (#27300)David Heinemeier Hansson2016-12-0811-111/+34
| * | | Update puma.rbbrchristian2016-12-051-6/+6
| * | | Add fullstop following the pattern used in rest of the filePrathamesh Sonpatki2016-12-051-1/+1
| * | | Fix binstop -> binstub typo in railties changelog.Josef Šimánek2016-12-051-1/+1
| * | | Use JavaScripts instead of Javascripts in `rake stats`Koichi ITO2016-12-031-1/+1
| * | | use yarn binstub in `bin/update`yuuji.yaginuma2016-12-021-1/+1
| * | | Yarn: Move node_modules, package.json, and yarn.lock file to vendor (#27245)David Heinemeier Hansson2016-12-018-12/+16
| * | | use `Gem.win_platform?` to check windows Ruby platformsyuuji.yaginuma2016-11-304-5/+5
| * | | Merge pull request #27221 from phoet/current_is_not_usedMatthew Draper2016-11-301-1/+0
| |\ \ \
| | * | | removed `@current` as it is not usedphoet2016-11-301-1/+0
| * | | | fix typo in changelogRobert Glaser2016-11-301-1/+1
| |/ / /
| * | | Let's use only vendored rails-ujs while we start to publish it to npm registryGuillermo Iguaran2016-11-291-3/+1
| * | | Add CHANGELOG entry for --yarn optionLiceth Ovalles2016-11-291-0/+5
| * | | Merge pull request #26836 from Liceth/npmGuillermo Iguaran2016-11-298-3/+106
| |\ \ \
| | * | | Run yarn on setup and update scripts.Liceth Ovalles2016-11-282-2/+8