aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
* Fix generator command for nested (namespaced) rails engineFumiaki MATSUSHIMA2017-01-035-6/+6
| | | | | | | | | | | | | If we create nested (namespaced) rails engine such like bukkits-admin, `bin/rails g scaffold User name:string age:integer` will create `bukkits-admin/app/controllers/bukkits/users_controller.rb` but it should create `bukkits-admin/app/controllers/bukkits/admin/users_controller.rb`. In #6643, we changed `namespaced_path` as root path because we supposed application_controller is always in root but nested rails engine's application_controller will not.
* Remove bin/yarn if yarn is skipped, tidy up testsPrathamesh Sonpatki2017-01-011-2/+2
| | | | | | - No need to remove bin/yarn separately for API only apps because :skip_yarn is set to true for API only apps. - Added a test for :skip_yarn config.
* remove unnecessary `remove_file`yuuji.yaginuma2017-01-011-1/+0
| | | | | | It deletes the `app/mailers` directory itself, it is not necessary to delete the file individually. https://github.com/rails/rails/blob/master/railties/lib/rails/generators/rails/app/app_generator.rb#L329
* Match Thor's `desc` signature.Kasper Timm Hansen2016-12-311-1/+1
| | | | It can also take an options hash.
* Prevent command name being printed twice.Kasper Timm Hansen2016-12-311-0/+8
| | | | | | | | | Thor would inadvertantly duplicate the command usage because of the help method in a command class. Fixes #26664. [ Yuji Yaginuma & Kasper Timm Hansen ]
* remove `skip_bundle` option from plugin generatoryuuji.yaginuma2016-12-312-3/+3
| | | | | | | Because `bundle install` is not executed regardless of whether the option is specified or not. Ref: fbd1e98cf983572ca9884f17f933ffe92833632a
* Enforce middleware ordering with a test, instead of commentsMatthew Draper2016-12-311-3/+1
| | | | | | | | | We want the actual order to be very predictable, so it's rightly defined in code -- not with an on-the-fly tsort. But we can do the tsort here, and then verify that it matches the implemented ordering. This way we don't leave future readers guessing which parts of the ordering are deliberate and which are arbitrary.
* Allow log remote ip addres when config.action_dispatch.trusted_proxies passedLeonid Batizhevsky2016-12-301-1/+2
|
* Remove needless `ActiveSupport::Deprecation.silence`Ryuta Kamizono2016-12-311-3/+1
|
* Remove deprecated support to passing a column to #quoteRafael Mendonça França2016-12-291-0/+1
|
* Merge branch 'master' into fix_26964Kasper Timm Hansen2016-12-2940-472/+449
|\
| * 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
| * | | clear all environments log files by defaultyuuji.yaginuma2016-10-141-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 parseyuuji.yaginuma2016-12-241-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 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
| | | |