aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Modernize SQL Server database YAML for Linux/vNext.Ken Collins2017-01-271-21/+4
|
* remove warning from `bin/setup` testyuuji.yaginuma2017-01-261-1/+1
| | | | | | | | This removes the following warnings. ``` test/application/bin_setup_test.rb:43: warning: ambiguous first argument; put parentheses or a space even after `/' operator ```
* 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.
* | Bundler 1.14 compatMatthew Draper2017-01-231-1/+4
| |
* | do not run `git init` when specify the `pretend` optionyuuji.yaginuma2017-01-232-1/+2
| | | | | | | | | | When specifying the `pretend` option, expect that no processing will be done, so do not execute `git init` as well.
* | Merge two tests that needs to initialize Rails before accessing `Rails`Akira Matsuda2017-01-231-16/+1
|/ | | | | Fixes "NameError: uninitialized constant ApplicationTests::ConfigurationTests::CustomTest::Rails" when run individually
* Merge pull request #27734 from y-yagi/update_create_table_statements_in_sqlite3Andrew White2017-01-191-2/+2
|\ | | | | update CREATE TABLE statements generated by `sqlite3` command
| * update CREATE TABLE statements generated by `sqlite3` commandyuuji.yaginuma2017-01-191-2/+2
| | | | | | | | | | | | | | From SQLite 3.16.0, `IF NOT EXISTS` set to CREATE TABLE statements. Ref: https://www.sqlite.org/src/info/c7021960f5c070fb Fixes #27635.
* | 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-184-2/+20
|\ | | | | | | Initalize git repo when creatin new rails app
| * Initalize git repo when creatin new rails appdixpac2017-01-124-2/+20
| | | | | | | | | | * 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-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
| |/ |/|