aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into clear_all_environments_log_by_defaultRafael França2016-12-2965-498/+578
|\
| * Fix Rubocop violations and fix documentation visibilityRafael Mendonça França2016-12-281-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 generationMatthew Draper2016-12-251-11/+14
| | | | | | | | | | | | Fixes #27447 [Matthew Draper & Yuuji Yaginuma]
| * 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
| | | | | | | | there aren't any instance method defined in this class
| * Describe what we are protectingAkira Matsuda2016-12-232-0/+4
| |
| * `ARGV.shift` before calling Rails generatorsJon Moss2016-12-171-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 MATSUSHIMA2016-12-141-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` optionyuuji.yaginuma2016-12-141-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 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-121-2/+5
| | | | | | | | 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
| |
| * specify `skip_yarn` option in API-only Application (#27309)Yuji Yaginuma2016-12-081-2/+8
| |
| * 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-088-84/+22
| | |
| * | 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
| | |
| * | 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-016-9/+13
| | | | | | | | | 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
| * | removed `@current` as it is not usedphoet2016-11-301-1/+0
| | |
| * | Let's use only vendored rails-ujs while we start to publish it to npm registryGuillermo Iguaran2016-11-291-3/+1
| | |
| * | Merge pull request #26836 from Liceth/npmGuillermo Iguaran2016-11-297-3/+82
| |\ \ | | | | | | | | 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-281-0/+4
| | | |
| | * | Add package.json for Yarn if --yarn option is addedLiceth Ovalles2016-11-283-1/+65
| | | |
| * | | rails-ujs is now shipped with Action ViewGuillermo Iguaran2016-11-291-3/+0
| |/ /
| * | Don't add jQuery by default in new apps and use rails-ujs as UJS adapter insteadGuillermo Iguaran2016-11-212-4/+11
| | |
| * | deep symbolize keys on secrets.ymlIsaac Sloan2016-11-211-2/+2
| | |
| * | Pass `rails runner` args onto file again.Kasper Timm Hansen2016-11-201-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 Iguaran2016-11-192-2/+2
| | | | | | | | | | | | if turbolinks is present in gemfile list
| * | Use secure source for gems referencing "github" in the generated appsPrathamesh Sonpatki2016-11-181-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 Tanimichi2016-11-141-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-coffeeSean Griffin2016-11-121-1/+6
| |\ \ | | | | | | | | | | | | Add --skip-coffee generating option
| | * | Add --skip-coffee generating optionseunghwan oh2016-06-021-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Usage `rails new awesome-project --skip-coffee`
| * | | remove unused requireyuuji.yaginuma2016-11-051-3/+0
| | | | | | | | | | | | | | | | YAML and ERB were removed at 971d510
| * | | Use tr instead of gsubAkira Matsuda2016-11-021-1/+1
| | | |
| * | | remove warning from railtieyuuji.yaginuma2016-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the following warnings. ```ruby rails/railties/lib/rails/railtie.rb:186: warning: instance variable @rake_tasks not initialized rails/railties/lib/rails/railtie.rb:186: warning: instance variable @rake_tasks not initialized rails/railties/lib/rails/railtie.rb:186: warning: instance variable @load_console not initialized rails/railties/lib/rails/railtie.rb:186: warning: instance variable @rake_tasks not initialized ```