aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #27042 from kirs/yaml-schema-cacheRafael França2016-12-131-2/+2
|\ | | | | Schema cache in YAML
| * 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
| | | | | | | | | | | | | | Unintentionally makes `--webpack` implied on `rails new apper`. If passed `--webpack` Thor assigns `"webpack"` to `options[:webpack]`, so we can check for that instead of `"base"`.
* | Add option to trigger JS framework-specific installation as part of webpack ↵David Heinemeier Hansson2016-12-122-2/+17
| | | | | | | | setup
* | Oops!Akira Matsuda2016-12-121-1/+1
| | | | | | | | namespace_ladder can be nil here
* | :nail_care:Akira Matsuda2016-12-121-2/+2
| | | | | | | | Don't expect the caller of this method to know that the return value has an extra " "
* | 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
| | | | | | | | | | | | | | | | | | This fixes the following error when executing rails new command. ``` (erb):9:in `block in template': undefined method `comment' for nil:NilClass (NoMethodError) ``` Follow up to #27288
* | 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
| | | | | | Follow up to 0d20530e5edfd7d00fbc2a38ef5f87eca6ccc924
* | 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 as binary
| * | Extract notes from files in binaryBenjamin Fleischer2016-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents: ArgumentError: invalid byte sequence in UTF-8 railties/lib/rails/source_annotation_extractor.rb:115:in `=~' railties/lib/rails/source_annotation_extractor.rb:115:in `block in extract_annotations_from' And there's no reason we need to interpret the files as UTF-8 when scanning for annotations. Applies to Rails 4.2 as well.
* | | Make Yarn the default, drop default vendor/asset directories (#27300)David Heinemeier Hansson2016-12-0811-111/+34
| | |
* | | Update puma.rbbrchristian2016-12-051-6/+6
| | | | | | | | | Clarifying some of the language/punctuation and removing a couple comma splices.
* | | 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
| | | | | | | | | [ci skip]
* | | 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
| | | | | | | | | | | | Follow up to 3dac36bd8e26363bb10f4d2a7b21efa75d200e26
* | | Yarn: Move node_modules, package.json, and yarn.lock file to vendor (#27245)David Heinemeier Hansson2016-12-018-12/+16
| | | | | | | | | Move node_modules, package.json, and yarn.lock file to vendor
* | | use `Gem.win_platform?` to check windows Ruby platformsyuuji.yaginuma2016-11-304-5/+5
| | | | | | | | | | | | | | | `Gem.win_platform?` check if it is Windows more accurately. Ref: https://github.com/ruby/ruby/blob/ruby_2_2/lib/rubygems.rb#L945..L952
* | | Merge pull request #27221 from phoet/current_is_not_usedMatthew Draper2016-11-301-1/+0
|\ \ \ | | | | | | | | removed `@current` as it is not used
| * | | 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
|\ \ \ | | | | | | | | Add Yarn support in new apps using --yarn option
| * | | Run yarn on setup and update scripts.Liceth Ovalles2016-11-282-2/+8
| | | |
| * | | Add node_modules to default gitignoreLiceth Ovalles2016-11-281-0/+5
| | | |
| * | | Add node_modules path to assets load paths when --yarn option is usedLiceth Ovalles2016-11-282-0/+5
| | | |
| * | | Add package.json for Yarn if --yarn option is addedLiceth Ovalles2016-11-284-1/+88
| | | |
* | | | rails-ujs is now shipped with Action ViewGuillermo Iguaran2016-11-294-8/+2
| | | |
* | | | use correct variable in BacktraceCleaner testyuuji.yaginuma2016-11-261-1/+1
| | | | | | | | | | | | | | | | `@target_dir` variable was changed to local variable in 8e1714b.
* | | | Merge pull request #27140 from ↵Rafael França2016-11-252-1/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | supercaracal/fix-force-ssl-if-session-store-disabled Fix a force ssl redirection bug that occur when session store disabled.
| * | | | Remove aggressive unit test with mock. And add integration level test.Taishi Kasuga2016-11-242-1/+19
| | | | |
* | | | | [ci skip] `MiniTest` -> `Minitest`Fumiaki MATSUSHIMA2016-11-241-1/+1
| |/ / / |/| | | | | | | | | | | | | | | | | | | MiniTest was renamed to Minitest. Already renamed on https://github.com/rails/rails/pull/13366 But slipped into on https://github.com/rails/rails/pull/18413/files#diff-6bb90a693835b0e92910b796c8b0ef59R27
* | | | Add CHANGELOG entryGuillermo Iguaran2016-11-211-0/+5
| | | |
* | | | Don't add jQuery by default in new apps and use rails-ujs as UJS adapter insteadGuillermo Iguaran2016-11-215-18/+20
|/ / /
* | / deep symbolize keys on secrets.ymlIsaac Sloan2016-11-213-2/+22
| |/ |/|
* | Pass `rails runner` args onto file again.Kasper Timm Hansen2016-11-202-1/+10
| | | | | | | | | | | | | | | | | | When making the new command insfrastructure I had missed that `bin/rails runner some_file.rb some args` would pass the extra args onto the file in `ARGV`. Now fixed by allowing the command to take extra args again, and make sure to remove the file name from `ARGV`.
* | Use existing --skip-turbolinks option for conditionals instead of checking ↵Guillermo Iguaran2016-11-192-2/+2
| | | | | | | | if turbolinks is present in gemfile list
* | Merge pull request #27106 from prathamesh-sonpatki/add-missing-testEileen M. Uchitelle2016-11-191-0/+20
|\ \ | | | | | | Add missing test for singular resource output in rake routes
| * | Add missing test for singular resource output in rake routesPrathamesh Sonpatki2016-11-191-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | - This test was present in https://github.com/rails/rails/pull/27089 but not present on master, may be removed in merge commit? - There was discussion about moving this to `application/rake_test` so may be this happened in merge commit. - https://github.com/rails/rails/pull/27089#discussion_r88731157
* | | move CHANGELOG entry to the appropriate file [ci skip]yuuji.yaginuma2016-11-191-6/+0
|/ / | | | | | | Follow up to #27098
* | Merge pull request #27089 from erickueen/erickueen_fix_26606Rafael Mendonça França2016-11-181-3/+3
|\ \ | | | | | | | | | Fix incorrect output from rails routes when using singular resources …
| * | Fix incorrect output from rails routes when using singular resources issue ↵Erick Reyna2016-11-182-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #26606 Rails routes (even rake routes in previous versions) output showed incorrect routes when an application use resource :controller, implying that edit_controller_path match with controller#show. The order of the output has changed to correct this. View #26606 for more information. Added a test case, change unit test in rake to expect the new output. Since the output of resource :controller is changing, the string spected of the railties/test/application/rake_test.rb test_rails_routes_with_controller_environment had to be modified.