aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #27605 from ↵Godfrey Chan2017-02-142-3/+7
|\ | | | | | | | | mtsmfm/fix-generator-command-for-nested-rails-engine-take-2 Fix generator command for nested (namespaced) rails engine (take 2)
| * Fix generator command for nested (namespaced) rails engine (take 2)Fumiaki MATSUSHIMA2017-01-072-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite https://github.com/rails/rails/pull/27550 085546df45 was reverted (b6ffb5efcb) because it change the return of `namespaced_path` from String to Array. ---------------- 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.
* | Add `Style/EmptyLinesAroundMethodBody` in `.rubocop.yml` and remove extra ↵Ryuta Kamizono2017-02-121-1/+0
| | | | | | | | empty lines
* | Fix rubocop violationsRafael Mendonça França2017-02-091-1/+1
| |
* | remove `ActiveSupport.halt_callback_chains_on_return_false` from everywhereyuuji.yaginuma2017-02-081-3/+0
| |
* | Merge pull request #27802 from domcleal/27801-multiple-rake-testsKasper Timm Hansen2017-02-051-7/+7
|\ \ | | | | | | Collect all file patterns when running multiple rake test tasks
| * | Collect all file patterns when running multiple rake test tasksDominic Cleal2017-02-041-7/+7
| | | | | | | | | | | | | | | | | | | | | Replaces the rake_patterns instance variable with simple require, as `autorun` will run tests from all eagerly required test files. Fixes #27801
* | | Merge pull request #27891 from y-yagi/ignore_yarn_error_logEileen M. Uchitelle2017-02-031-0/+1
|\ \ \ | | | | | | | | Ignore yarn error log file
| * | | Ignore yarn error log fileyuuji.yaginuma2017-02-031-0/+1
| |/ /
* / / generate mailer layout files only when it does not existyuuji.yaginuma2017-02-021-1/+1
|/ / | | | | | | If already have layout files, in many cases use it.
* | Merge pull request #27842 from richseviora/masterRafael França2017-01-311-0/+10
|\ \ | | | | | | Added warning for reserved YAML keywords.
| * | Added warning for reserved YAML keywords.Rich Seviora2017-01-301-0/+10
| | | | | | | | | | | | | | | | | | Update i18n.md Addressed Feedback
* | | Merge pull request #27647 from Shopify/fully-eagerload-journeyRafael França2017-01-302-1/+17
|\ \ \ | | | | | | | | Fully initialize routes before the first request is handled
| * | | Fully initialize routes before the first request is handledJean Boussier2017-01-182-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `AD::Journey::GTG::Simulator` is lazily built the first time `Journey::Router#find_routes` is invoked, which happens when the first request is served. On large applications with many routes, building the simulator can take several hundred milliseconds (~700ms for us). Triggering this initialization during the boot process reduces the impact of deploys on the application response time.
* | | | Merge pull request #27784 from y-yagi/add_warnings_option_to_test_runnerRafael França2017-01-301-0/+5
|\ \ \ \ | |_|/ / |/| | | add warnings option to test runner
| * | | add warnings option to test runneryuuji.yaginuma2017-01-241-0/+5
| | | |
* | | | Modernize SQL Server database YAML for Linux/vNext.Ken Collins2017-01-271-21/+4
| | | |
* | | | s/an/a/Akira Matsuda2017-01-261-1/+1
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #27772 from y-yagi/remove_unreachable_codeSantiago Pastorino2017-01-242-8/+0
|\ \ \ \ | | | | | | | | | | remove unreachable code
| * | | | remove unreachable codeyuuji.yaginuma2017-01-232-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` optionyuuji.yaginuma2017-01-231-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 Hansson2017-01-191-1/+1
| | | | | | | | | | | | tool like Capistrano and we dont need the play-by-play
* | | only enhance when `assets:precompile` task is definedyuuji.yaginuma2017-01-181-1/+3
| | |
* | | load yarn.rakeyuuji.yaginuma2017-01-181-0/+1
| | | | | | | | | | | | Follow up to b1c08d8d9b921fdcf3813b5c20a0c3fab96eccca
* | | Merge pull request #27632 from dixpac/repo_initializeRafael Mendonça França2017-01-181-0/+7
|\ \ \ | | | | | | | | | | | | Initalize git repo when creatin new rails app
| * | | Initalize git repo when creatin new rails appdixpac2017-01-121-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_generatorRafael França2017-01-181-1/+1
|\ \ \ \ | | | | | | | | | | match indentations in environment template
| * | | | match indentationsnin0422017-01-121-1/+1
| | | | |
* | | | | Add channel_prefix support to ActionCable redis/evented_redis adapters.Chad Ingram2017-01-171-0/+1
| | | | |
* | | | | Merge pull request #27706 from y-yagi/allow_to_pass_describe_option_to_rakeRafael França2017-01-172-2/+4
|\ \ \ \ \ | | | | | | | | | | | | allow to pass describe option to rake
| * | | | | allow to pass describe option to rakeyuuji.yaginuma2017-01-172-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 violationsRafael Mendonça França2017-01-172-3/+2
| | | | | |
* | | | | | Merge pull request #27717 from JunichiIto/fix-byebug-platformRafael França2017-01-171-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Install Byebug gem as default in Windows (mingw and x64_mingw) platform.
| * | | | | | Change `platform` to `platforms`Junichi Ito2017-01-181-1/+1
| | | | | | |
| * | | | | | Install Byebug gem as default in Windows (mingw and x64_mingw) platform.Junichi Ito2017-01-181-1/+1
| |/ / / / /
* | | | | | Be a bit more explicit rather than relying on the default taskDavid Heinemeier Hansson2017-01-171-1/+1
| | | | | |
* | | | | | Make yarn install available as a rake task via yarn:install so we can use ↵David Heinemeier Hansson2017-01-171-0/+9
|/ / / / / | | | | | | | | | | | | | | | that as a dependency for assets:precompile
* | | | | Merge pull request #27601 from y-yagi/make_work_all_commands_from_engineKasper Timm Hansen2017-01-155-27/+20
|\ \ \ \ \ | | | | | | | | | | | | Make all rails commands work in engine
| * | | | | make all rails commands work in engineyuuji.yaginuma2017-01-095-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.yaginuma2017-01-151-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 superclassAkira Matsuda2017-01-131-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 classAkira Matsuda2017-01-132-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 stringsAkira Matsuda2017-01-125-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_requireRafael França2017-01-113-6/+0
|\ \ \ \ \ | |_|/ / / |/| | | | remove unused requires
| * | | | remove unused requiresyuuji.yaginuma2017-01-123-6/+0
| |/ / / | | | | | | | | | | | | Related to 0129ca2eeb6d5b2ea8c6e6be38eeb770fe45f1fa, f7782812f7e727178e4a743aa2874c078b722eef, f9ed83321ac1d1902578a0aacdfe55d3db754219
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2017-01-116-14/+14
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Conflicts: railties/lib/rails/generators.rb
| * | | Small grammar fixes in `Rails::Paths`Jon Moss2016-12-201-2/+2
| | | | | | | | | | | | | | | | [ci skip]
| * | | Small grammar fixes in `Rails::Info`Jon Moss2016-12-201-3/+3
| | | | | | | | | | | | | | | | [ci skip]
| * | | Capitalize RakeJon Moss2016-12-191-3/+3
| | | | | | | | | | | | | | | | [ci skip]
| * | | Capitalize Ruby and small grammar fixJon Moss2016-12-191-1/+1
| | | | | | | | | | | | | | | | [ci skip]