aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* 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-172-1/+5
|\ \ | | | | | | 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-182-1/+5
| |/
* | Move config reset to ensure blockAndrew White2017-01-171-1/+2
| | | | | | | | We don't want to leak the extra migration path to other railties tests.
* | Move config reset to ensure blockAndrew White2017-01-171-1/+2
| | | | | | | | We don't want to leak the extra migration path to other railties tests.
* | Merge pull request #27674 from kjg/migration_generator_honor_path_configAndrew White2017-01-172-0/+20
|\ \ | | | | | | Generate migrations at path set by `config.paths["db/migrate"]`
| * | Generate migrations at path set by `config.paths["db/migrate"]`Kevin Glowacz2017-01-162-0/+20
| |/
* | 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
* | Don't pollute Object with rubinius_skip and jruby_skipAkira Matsuda2017-01-171-9/+9
|/ | | | we call them only in the tests
* Merge pull request #27601 from y-yagi/make_work_all_commands_from_engineKasper Timm Hansen2017-01-1510-54/+124
|\ | | | | Make all rails commands work in engine
| * improve server default options testyuuji.yaginuma2017-01-091-3/+3
| | | | | | | | | | | | | | This test was added in 221b4ae. 221b4ae modified to return the same result even if `Rails::Server#default_options` is called more than once. Therefore, also use `Rails::Server#default_options` instead of `ServerCommand#default_options` in test.
| * make all rails commands work in engineyuuji.yaginuma2017-01-099-51/+121
| | | | | | | | | | | | | | | | 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-133-3/+3
| | | | | | | | 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]
| * | | Capitalize Rack gem nameJon Moss2016-12-191-3/+3
| | | | | | | | | | | | | | | | [ci skip]
| * | | Capitalize Thor gem nameJon Moss2016-12-192-2/+2
| | | | | | | | | | | | | | | | [ci skip]
* | | | Current default Rails app encoding "utf-8" looks more like a W3C charset ↵Akira Matsuda2017-01-111-1/+1
| |/ / |/| | | | | | | | than a ruby encoding
* | | Revert "Merge pull request #27619 from dixpac/add_missing_generator_test"yuuji.yaginuma2017-01-101-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8cb3cdffdb70f3575518d24ea96ec891e40d21d0, reversing changes made to 3bc747bd8676dc940b531067e2861dcd4ac28efc. Reason: This test already exists in `SharedGeneratorTests`. Ref: https://github.com/rails/rails/blob/master/railties/test/generators/shared_generator_tests.rb#L109..L112 https://github.com/rails/rails/blob/master/railties/test/generators/app_generator_test.rb#L55..L56
* | | Test `--skip-git` generator optiondixpac2017-01-091-0/+5
| |/ |/|
* | Don't generate HTML/ERB templates for scaffold controller with --api flagPrathamesh Sonpatki2017-01-073-1/+18
| | | | | | | | - Fixes #27591.
* | `self.` is not needed when calling its own instance methodAkira Matsuda2017-01-058-9/+9
| | | | | | | | Actually, private methods cannot be called with `self.`, so it's not just redundant, it's a bad habit in Ruby
* | Fix style guide violationsRafael Mendonça França2017-01-051-1/+0
| |
* | Merge pull request #27399 from sinogermany/rails-env-for-empty-string-env-varsRafael Mendonça França2017-01-033-1/+18
|\ \ | | | | | | | | | Rails env for empty string env vars
| * | Rails.env falls back to dev mode when env var is emptyDaniel Deng2017-01-043-1/+18
| |/
* | Fix configuration test now that Metal#env was removedRafael Mendonça França2017-01-031-1/+1
| |
* | Revert "Merge pull request #27550 from ↵Rafael Mendonça França2017-01-036-26/+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ça2017-01-036-6/+26
|\ \ | | | | | | | | | | | | mtsmfm/fix-generator-command-for-nested-rails-engine Fix generator command for nested (namespaced) rails engine
| * | Fix generator command for nested (namespaced) rails engineFumiaki MATSUSHIMA2017-01-036-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 test to the db:test:cloneRafael Mendonça França2017-01-031-10/+0
| | |
* | | Remove deprecated CONTROLLER environment variable for routes taskRafael Mendonça França2017-01-033-49/+29
| | |
* | | Remove deprecated tasks in railtiesRafael Mendonça França2017-01-032-12/+5
| | |
* | | Remove deprecated file `rails/rack/debuggerRafael Mendonça França2017-01-032-3/+4
| | |
* | | Remove deprecated config.serve_static_filesRafael Mendonça França2017-01-033-29/+4
| | |
* | | Remove deprecated `config.static_cache_control`Rafael Mendonça França2017-01-034-24/+6
| | |
* | | Merge pull request #24814 from vipulnsward/24811-fix-double-tasksArthur Nogueira Neves2017-01-031-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 M2016-07-091-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_25307Sean Griffin2017-01-032-2/+2
|\ \ \ \ | |_|/ / |/| | | Active Record supports MySQL >= 5.1.10