Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into fix_26964 | Kasper Timm Hansen | 2016-12-29 | 40 | -472/+449 |
|\ | |||||
| * | Merge branch 'master' into clear_all_environments_log_by_default | Rafael França | 2016-12-29 | 65 | -498/+578 |
| |\ | |||||
| | * | 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. | ||||
| | * | Correct indent-accounting in controller route generation | Matthew Draper | 2016-12-25 | 1 | -11/+14 |
| | | | | | | | | | | | | | | | | | | Fixes #27447 [Matthew Draper & Yuuji Yaginuma] | ||||
| | * | 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 | ||||
| | * | Describe what we are protecting | Akira Matsuda | 2016-12-23 | 2 | -0/+4 |
| | | | |||||
| | * | `ARGV.shift` before calling Rails generators | Jon Moss | 2016-12-17 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | 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) ``` | ||||
| | * | 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 | 1 | -2/+5 |
| | | | | | | | | | | | | 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 |
| | | | |||||
| | * | specify `skip_yarn` option in API-only Application (#27309) | Yuji Yaginuma | 2016-12-08 | 1 | -2/+8 |
| | | | |||||
| | * | 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 | 8 | -84/+22 |
| | | | | |||||
| | * | | 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 |
| | | | | |||||
| | * | | 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 | ||||
| * | | | clear all environments log files by default | yuuji.yaginuma | 2016-10-14 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | In #22703, `log:clear` task has been changed to clear only standard environment log files. However, it is often to add a non-standard environment(e.g. "staging"). Therefore, I think than it is better to clear all environments log files by default. | ||||
* | | | | use Thor option parser in server commands parse | yuuji.yaginuma | 2016-12-24 | 1 | -54/+67 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | The `ServerCommand` inherits Thor, but currently does not use Thor option parser. Therefore, if leave the argument of Thor as it is, it becomes an error by the argument checking of Thor. To avoid it, to use the Thor option parser instead of reimplementing it. Fixes #26964 | ||||
* | | | Yarn: Move node_modules, package.json, and yarn.lock file to vendor (#27245) | David Heinemeier Hansson | 2016-12-01 | 6 | -9/+13 |
| | | | | | | | | | 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 | ||||
* | | | removed `@current` as it is not used | phoet | 2016-11-30 | 1 | -1/+0 |
| | | | |||||
* | | | Let's use only vendored rails-ujs while we start to publish it to npm registry | Guillermo Iguaran | 2016-11-29 | 1 | -3/+1 |
| | | | |||||
* | | | Merge pull request #26836 from Liceth/npm | Guillermo Iguaran | 2016-11-29 | 7 | -3/+82 |
|\ \ \ | | | | | | | | | Add Yarn support in new apps using --yarn option | ||||
| * | | | Run yarn on setup and update scripts. | Liceth Ovalles | 2016-11-28 | 2 | -2/+8 |
| | | | | |||||
| * | | | Add node_modules to default gitignore | Liceth Ovalles | 2016-11-28 | 1 | -0/+5 |
| | | | | |||||
| * | | | Add node_modules path to assets load paths when --yarn option is used | Liceth Ovalles | 2016-11-28 | 1 | -0/+4 |
| | | | | |||||
| * | | | Add package.json for Yarn if --yarn option is added | Liceth Ovalles | 2016-11-28 | 3 | -1/+65 |
| | | | | |||||
* | | | | rails-ujs is now shipped with Action View | Guillermo Iguaran | 2016-11-29 | 1 | -3/+0 |
|/ / / | |||||
* | | | Don't add jQuery by default in new apps and use rails-ujs as UJS adapter instead | Guillermo Iguaran | 2016-11-21 | 2 | -4/+11 |
| | | | |||||
* | | | deep symbolize keys on secrets.yml | Isaac Sloan | 2016-11-21 | 1 | -2/+2 |
| | | | |||||
* | | | Pass `rails runner` args onto file again. | Kasper Timm Hansen | 2016-11-20 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Iguaran | 2016-11-19 | 2 | -2/+2 |
| | | | | | | | | | | | | if turbolinks is present in gemfile list | ||||
* | | | Use secure source for gems referencing "github" in the generated apps | Prathamesh Sonpatki | 2016-11-18 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | - New apps generated on master and latest bundler give warning about "github" source being insecure. - Use the same solution used for Rails master in the generated app's Gemfile to fix this issue. | ||||
* | | | Add `:skip_sprockets` to `Rails::PluginBuilder::PASSTHROUGH_OPTIONS` | Tsukuru Tanimichi | 2016-11-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `rails plugin new` with `--full` and `--skip-sprockets` options generates a dummy application that throws `NoMethodError`. ``` % rails plugin new my_engine -S --full --skip-gemspec % cd my_engine % bin/rails test rails aborted! NoMethodError: undefined method `assets' for #<Rails::Application::Configuration:0x007f83aa1e6100> ``` | ||||
* | | | Merge pull request #25248 from bluesh55:features/skip-coffee | Sean Griffin | 2016-11-12 | 1 | -1/+6 |
|\ \ \ | | | | | | | | | | | | | Add --skip-coffee generating option | ||||
| * | | | Add --skip-coffee generating option | seunghwan oh | 2016-06-02 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | Usage `rails new awesome-project --skip-coffee` |