Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #27772 from y-yagi/remove_unreachable_code | Santiago Pastorino | 2017-01-24 | 2 | -8/+0 |
|\ | | | | | remove unreachable code | ||||
| * | remove unreachable code | yuuji.yaginuma | 2017-01-23 | 2 | -8/+0 |
| | | | | | | | | | | | | `app_path` is a required argument. Therefore, if `app_path` is not specified, it becomes an error in thor's option parsing, does not reach this check. | ||||
* | | do not run `git init` when specify the `pretend` option | yuuji.yaginuma | 2017-01-23 | 1 | -1/+1 |
|/ | | | | | When specifying the `pretend` option, expect that no processing will be done, so do not execute `git init` as well. | ||||
* | Make Yarn quieter during precompilation as that is typically run by a deploy ↵ | David Heinemeier Hansson | 2017-01-19 | 1 | -1/+1 |
| | | | | tool like Capistrano and we dont need the play-by-play | ||||
* | only enhance when `assets:precompile` task is defined | yuuji.yaginuma | 2017-01-18 | 1 | -1/+3 |
| | |||||
* | load yarn.rake | yuuji.yaginuma | 2017-01-18 | 1 | -0/+1 |
| | | | | Follow up to b1c08d8d9b921fdcf3813b5c20a0c3fab96eccca | ||||
* | Merge pull request #27632 from dixpac/repo_initialize | Rafael Mendonça França | 2017-01-18 | 1 | -0/+7 |
|\ | | | | | | | Initalize git repo when creatin new rails app | ||||
| * | Initalize git repo when creatin new rails app | dixpac | 2017-01-12 | 1 | -0/+7 |
| | | | | | | | | | | * If `--skip-git` is not specified initalize git repo when creating new rails app | ||||
* | | Merge pull request #27653 from s-jcs/feature/adjust_indentation_for_generator | Rafael França | 2017-01-18 | 1 | -1/+1 |
|\ \ | | | | | | | match indentations in environment template | ||||
| * | | match indentations | nin042 | 2017-01-12 | 1 | -1/+1 |
| | | | |||||
* | | | Add channel_prefix support to ActionCable redis/evented_redis adapters. | Chad Ingram | 2017-01-17 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #27706 from y-yagi/allow_to_pass_describe_option_to_rake | Rafael França | 2017-01-17 | 2 | -2/+4 |
|\ \ \ | | | | | | | | | allow to pass describe option to rake | ||||
| * | | | allow to pass describe option to rake | yuuji.yaginuma | 2017-01-17 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Since `Thor::HELP_MAPPINGS` contains `-D`, so `bin/rails -D` show rails's help. But, in Rails 5.0.1, `bin/rails -D` show the description of rake task. I think that it is better to have the same behavior. | ||||
* | | | | Fix all rubocop violations | Rafael Mendonça França | 2017-01-17 | 2 | -3/+2 |
| | | | | |||||
* | | | | Merge pull request #27717 from JunichiIto/fix-byebug-platform | Rafael França | 2017-01-17 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Install Byebug gem as default in Windows (mingw and x64_mingw) platform. | ||||
| * | | | | Change `platform` to `platforms` | Junichi Ito | 2017-01-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Install Byebug gem as default in Windows (mingw and x64_mingw) platform. | Junichi Ito | 2017-01-18 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Be a bit more explicit rather than relying on the default task | David Heinemeier Hansson | 2017-01-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | Make yarn install available as a rake task via yarn:install so we can use ↵ | David Heinemeier Hansson | 2017-01-17 | 1 | -0/+9 |
|/ / / | | | | | | | | | | that as a dependency for assets:precompile | ||||
* | | | Merge pull request #27601 from y-yagi/make_work_all_commands_from_engine | Kasper Timm Hansen | 2017-01-15 | 5 | -27/+20 |
|\ \ \ | | | | | | | | | Make all rails commands work in engine | ||||
| * | | | make all rails commands work in engine | yuuji.yaginuma | 2017-01-09 | 5 | -27/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, all rails commands can be executed in engine, but `server`, `console`, `dbconsole` and `runner` do not work. This make all rails commands work in engine. Related to #22588 | ||||
* | | | | remove unnecessary addition of `lib` | yuuji.yaginuma | 2017-01-15 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | `TestTask` add `lib` directory by default. Ref: https://github.com/ruby/rake/blob/master/lib/rake/testtask.rb#L39..L41 | ||||
* | | | | Rails::Generators::AppBase::GemfileEntry needs anonymous superclass | Akira Matsuda | 2017-01-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | it has some methods that override the accessors and calls the original accessors via `super` this partially reverts 9360b6be63b7a452535699bcf6ae853df7f5eea7 | ||||
* | | | | class Foo < Struct.new(:x) creates an extra unneeded anonymous class | Akira Matsuda | 2017-01-13 | 2 | -2/+2 |
| |_|/ |/| | | | | | | | | because Struct.new returns a Class, we just can give it a name and use it directly without inheriting from it | ||||
* | | | Reduce string objects by using \ instead of + or << for concatenating strings | Akira Matsuda | 2017-01-12 | 5 | -8/+8 |
| | | | | | | | | | | | | (I personally prefer writing one string in one line no matter how long it is, though) | ||||
* | | | Merge pull request #27652 from y-yagi/remove_unused_require | Rafael França | 2017-01-11 | 3 | -6/+0 |
|\ \ \ | |_|/ |/| | | remove unused requires | ||||
| * | | remove unused requires | yuuji.yaginuma | 2017-01-12 | 3 | -6/+0 |
| |/ | | | | | | | Related to 0129ca2eeb6d5b2ea8c6e6be38eeb770fe45f1fa, f7782812f7e727178e4a743aa2874c078b722eef, f9ed83321ac1d1902578a0aacdfe55d3db754219 | ||||
* | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2017-01-11 | 6 | -14/+14 |
|\ \ | | | | | | | | | | | | | Conflicts: railties/lib/rails/generators.rb | ||||
| * | | Small grammar fixes in `Rails::Paths` | Jon Moss | 2016-12-20 | 1 | -2/+2 |
| | | | | | | | | | | | | [ci skip] | ||||
| * | | Small grammar fixes in `Rails::Info` | Jon Moss | 2016-12-20 | 1 | -3/+3 |
| | | | | | | | | | | | | [ci skip] | ||||
| * | | Capitalize Rake | Jon Moss | 2016-12-19 | 1 | -3/+3 |
| | | | | | | | | | | | | [ci skip] | ||||
| * | | Capitalize Ruby and small grammar fix | Jon Moss | 2016-12-19 | 1 | -1/+1 |
| | | | | | | | | | | | | [ci skip] | ||||
| * | | Capitalize Rack gem name | Jon Moss | 2016-12-19 | 1 | -3/+3 |
| | | | | | | | | | | | | [ci skip] | ||||
| * | | Capitalize Thor gem name | Jon Moss | 2016-12-19 | 2 | -2/+2 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Current default Rails app encoding "utf-8" looks more like a W3C charset ↵ | Akira Matsuda | 2017-01-11 | 1 | -1/+1 |
| |/ |/| | | | | | than a ruby encoding | ||||
* | | Don't generate HTML/ERB templates for scaffold controller with --api flag | Prathamesh Sonpatki | 2017-01-07 | 1 | -1/+6 |
| | | | | | | | | - Fixes #27591. | ||||
* | | `self.` is not needed when calling its own instance method | Akira Matsuda | 2017-01-05 | 8 | -9/+9 |
| | | | | | | | | Actually, private methods cannot be called with `self.`, so it's not just redundant, it's a bad habit in Ruby | ||||
* | | Merge pull request #27399 from sinogermany/rails-env-for-empty-string-env-vars | Rafael Mendonça França | 2017-01-03 | 1 | -1/+2 |
|\ \ | | | | | | | | | | Rails env for empty string env vars | ||||
| * | | Rails.env falls back to dev mode when env var is empty | Daniel Deng | 2017-01-04 | 1 | -1/+2 |
| |/ | |||||
* | | Revert "Merge pull request #27550 from ↵ | Rafael Mendonça França | 2017-01-03 | 5 | -6/+6 |
| | | | | | | | | | | | | | | | | | | mtsmfm/fix-generator-command-for-nested-rails-engine" This reverts commit 1e969bfb98b88799e2c759fce25a1d8cf00d7ce7, reversing changes made to a5041f267ded119c2d00b8786c2f2c1e3f93c8a1. Reason: It breaks the public API | ||||
* | | Merge pull request #27550 from ↵ | Rafael França | 2017-01-03 | 5 | -6/+6 |
|\ \ | | | | | | | | | | | | | mtsmfm/fix-generator-command-for-nested-rails-engine Fix generator command for nested (namespaced) rails engine | ||||
| * | | Fix generator command for nested (namespaced) rails engine | Fumiaki MATSUSHIMA | 2017-01-03 | 5 | -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 deprecated CONTROLLER environment variable for routes task | Rafael Mendonça França | 2017-01-03 | 1 | -7/+0 |
| | | | |||||
* | | | Remove deprecated tasks in railties | Rafael Mendonça França | 2017-01-03 | 1 | -12/+0 |
| | | | |||||
* | | | Remove deprecated file `rails/rack/debugger | Rafael Mendonça França | 2017-01-03 | 1 | -3/+0 |
| | | | |||||
* | | | Remove deprecated config.serve_static_files | Rafael Mendonça França | 2017-01-03 | 1 | -19/+0 |
| | | | |||||
* | | | Remove deprecated `config.static_cache_control` | Rafael Mendonça França | 2017-01-03 | 2 | -13/+1 |
| | | | |||||
* | | | Merge pull request #24814 from vipulnsward/24811-fix-double-tasks | Arthur Nogueira Neves | 2017-01-03 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | Don't list out tasks as separately that are under lib, which cause them to be listed twice under Libraries and tasks. | ||||
| * | | | Don't list out tasks as separately that are under lib, which cause them to ↵ | Vipul A M | 2016-07-09 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be listed twice under Libraries and tasks. We already count and list it under libraries. Fixes #24811 | ||||
* | | | | Merge pull request #27435 from kamipo/follow_up_25307 | Sean Griffin | 2017-01-03 | 2 | -2/+2 |
|\ \ \ \ | |_|/ / |/| | | | Active Record supports MySQL >= 5.1.10 |