Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into clear_all_environments_log_by_default | Rafael França | 2016-12-29 | 100 | -588/+816 |
|\ | |||||
| * | Fix Rubocop violations and fix documentation visibility | Rafael Mendonça França | 2016-12-28 | 1 | -38/+38 |
| | | | | | | | | | | | | Some methods were added to public API in 5b14129d8d4ad302b4e11df6bd5c7891b75f393c and they should be not part of the public API. | ||||
| * | Add backticks to show shell command | Jon Moss | 2016-12-27 | 1 | -2/+2 |
| | | | | | | | | [ci skip] | ||||
| * | Remove random extra spaces from Action Pack and Railties CHANGELOG.md | Jon Moss | 2016-12-27 | 1 | -2/+2 |
| | | | | | | | | [ci skip] | ||||
| * | assert_equal takes expectation first | Akira Matsuda | 2016-12-26 | 1 | -1/+1 |
| | | |||||
| * | Correct indent-accounting in controller route generation | Matthew Draper | 2016-12-25 | 2 | -12/+15 |
| | | | | | | | | | | | | Fixes #27447 [Matthew Draper & Yuuji Yaginuma] | ||||
| * | "Use assert_nil if expecting nil. This will fail in minitest 6." | Akira Matsuda | 2016-12-25 | 5 | -8/+8 |
| | | |||||
| * | Privatize unneededly protected methods in Railties | Akira Matsuda | 2016-12-25 | 25 | -135/+136 |
| | | |||||
| * | Privatize some methods that were originally protected | Akira Matsuda | 2016-12-25 | 1 | -25/+27 |
| | | |||||
| * | Prefer class << self; def over def self. | Akira Matsuda | 2016-12-25 | 1 | -200/+200 |
| | | |||||
| * | `protected` here doesn't protect anything | Akira Matsuda | 2016-12-25 | 1 | -26/+25 |
| | | | | | | | | there aren't any instance method defined in this class | ||||
| * | Privatize unneededly protected methods in Railties tests | Akira Matsuda | 2016-12-24 | 6 | -6/+6 |
| | | |||||
| * | Describe what we are protecting | Akira Matsuda | 2016-12-23 | 2 | -0/+4 |
| | | |||||
| * | quiet generators log in test | yuuji.yaginuma | 2016-12-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This quiet the following log. ``` create app/mailers/notifier_mailer.rb invoke erb create app/views/notifier_mailer identical app/views/layouts/mailer.text.erb identical app/views/layouts/mailer.html.erb create app/views/notifier_mailer/foo.text.erb create app/views/notifier_mailer/foo.html.erb invoke test_unit create test/mailers/notifier_mailer_test.rb create test/mailers/previews/notifier_mailer_preview.rb ``` | ||||
| * | Limit length of secret being passed | Jon Moss | 2016-12-20 | 1 | -3/+3 |
| | | | | | | | | Very similar to PR #25758, see more in depth reasoning there. | ||||
| * | `ARGV.shift` before calling Rails generators | Jon Moss | 2016-12-17 | 2 | -0/+17 |
| | | | | | | | | | | | | Gems like rspec-rails depend on `ARGV` being shifted, and `scaffold` (for example) not being the first item in `ARGV`. This should allow rspec-rails to be passing on Rails master. | ||||
| * | Remove unused method `namespaced_file_path` | Fumiaki MATSUSHIMA | 2016-12-14 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | ``` $ git grep namespaced_file_path railties/lib/rails/generators/named_base.rb: def namespaced_file_path railties/lib/rails/generators/named_base.rb: @namespaced_file_path ||= namespaced_class_path.join("/") ``` | ||||
| * | use appropriate type for `rc` option | yuuji.yaginuma | 2016-12-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | This fixes the following warning. ``` Expected boolean default value for '--rc'; got "~/.railsrc" (string) ``` | ||||
| * | Merge pull request #27042 from kirs/yaml-schema-cache | Rafael França | 2016-12-13 | 1 | -2/+2 |
| |\ | | | | | | | Schema cache in YAML | ||||
| | * | Use YAML to serialize schema cache | Kir Shatrov | 2016-11-27 | 1 | -2/+2 |
| | | | |||||
| * | | Don't assign a default to `webpack`. | Kasper Timm Hansen | 2016-12-12 | 1 | -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 Hansson | 2016-12-12 | 2 | -2/+17 |
| | | | | | | | | | | | | setup | ||||
| * | | Oops! | Akira Matsuda | 2016-12-12 | 1 | -1/+1 |
| | | | | | | | | | | | | namespace_ladder can be nil here | ||||
| * | | :nail_care: | Akira Matsuda | 2016-12-12 | 1 | -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 specified | yuuji.yaginuma | 2016-12-10 | 1 | -1/+1 |
| | | | |||||
| * | | gemfile entry method need to return an empty array rather than nil (#27318) | Yuji Yaginuma | 2016-12-09 | 1 | -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 release | David Heinemeier Hansson | 2016-12-09 | 1 | -1/+1 |
| | | | |||||
| * | | Basic --webpack delegation to new webpacker gem (#27288) | David Heinemeier Hansson | 2016-12-09 | 2 | -1/+16 |
| | | | |||||
| * | | Show message if Yarn is not installed (#27312) | Guillermo Iguaran | 2016-12-09 | 1 | -1/+8 |
| | | | |||||
| * | | Only have Yarn bundling commented out as we cant be sure Yarn is installed | David Heinemeier Hansson | 2016-12-08 | 2 | -5/+2 |
| | | | |||||
| * | | Fix ability to run railties test suite | David Heinemeier Hansson | 2016-12-08 | 1 | -0/+1 |
| | | | |||||
| * | | fix broken tests (#27308) | Yuji Yaginuma | 2016-12-08 | 1 | -3/+2 |
| | | | | | | | | | Follow up to 0d20530e5edfd7d00fbc2a38ef5f87eca6ccc924 | ||||
| * | | specify `skip_yarn` option in API-only Application (#27309) | Yuji Yaginuma | 2016-12-08 | 2 | -3/+12 |
| | | | |||||
| * | | Merge pull request #25051 from bf4/extract_notes_as_binary | Sean Griffin | 2016-12-08 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Extract notes as binary | ||||
| | * | | Extract notes from files in binary | Benjamin Fleischer | 2016-09-05 | 1 | -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 Hansson | 2016-12-08 | 11 | -111/+34 |
| | | | | |||||
| * | | | Update puma.rb | brchristian | 2016-12-05 | 1 | -6/+6 |
| | | | | | | | | | | | | Clarifying some of the language/punctuation and removing a couple comma splices. | ||||
| * | | | Add fullstop following the pattern used in rest of the file | Prathamesh Sonpatki | 2016-12-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix binstop -> binstub typo in railties changelog. | Josef Šimánek | 2016-12-05 | 1 | -1/+1 |
| | | | | | | | | | | | | [ci skip] | ||||
| * | | | Use JavaScripts instead of Javascripts in `rake stats` | Koichi ITO | 2016-12-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | use yarn binstub in `bin/update` | yuuji.yaginuma | 2016-12-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Follow up to 3dac36bd8e26363bb10f4d2a7b21efa75d200e26 | ||||
| * | | | Yarn: Move node_modules, package.json, and yarn.lock file to vendor (#27245) | David Heinemeier Hansson | 2016-12-01 | 8 | -12/+16 |
| | | | | | | | | | | | | Move node_modules, package.json, and yarn.lock file to vendor | ||||
| * | | | use `Gem.win_platform?` to check windows Ruby platforms | yuuji.yaginuma | 2016-11-30 | 4 | -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_used | Matthew Draper | 2016-11-30 | 1 | -1/+0 |
| |\ \ \ | | | | | | | | | | | removed `@current` as it is not used | ||||
| | * | | | removed `@current` as it is not used | phoet | 2016-11-30 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | fix typo in changelog | Robert Glaser | 2016-11-30 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Let's use only vendored rails-ujs while we start to publish it to npm registry | Guillermo Iguaran | 2016-11-29 | 1 | -3/+1 |
| | | | | |||||
| * | | | Add CHANGELOG entry for --yarn option | Liceth Ovalles | 2016-11-29 | 1 | -0/+5 |
| | | | | |||||
| * | | | Merge pull request #26836 from Liceth/npm | Guillermo Iguaran | 2016-11-29 | 8 | -3/+106 |
| |\ \ \ | | | | | | | | | | | Add Yarn support in new apps using --yarn option | ||||
| | * | | | Run yarn on setup and update scripts. | Liceth Ovalles | 2016-11-28 | 2 | -2/+8 |
| | | | | |