aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Don't mutate raw_source in mailer preview interceptorEugene Kenny2017-01-301-0/+34
| | | | | | | | The raw_source method is documented as returning the exact value that was used to create the body; mutating it breaks that contract. Additionally, if the value used to create the body is blank, raw_source returns a frozen string which causes the interceptor to raise an error.
* 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 #27797 from y-yagi/correctly_check_error_messageArthur Nogueira Neves2017-01-301-2/+4
|\ \ \ | | | | | | | | correctly check error message
| * | | correctly check error messageyuuji.yaginuma2017-01-251-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `assert_raise` does not check error message. However, in some tests, it seems like expecting error message checking with `assert_raise`. Instead of specifying an error message in `assert_raise`, modify to use another assert to check the error message.
* | | | Merge pull request #27784 from y-yagi/add_warnings_option_to_test_runnerRafael França2017-01-304-0/+31
|\ \ \ \ | |_|_|/ |/| | | add warnings option to test runner
| * | | add warnings option to test runneryuuji.yaginuma2017-01-244-0/+31
| | | |
* | | | 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