Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #30166 from yhirano55/fix_generator_method_environment | Rafael Mendonça França | 2017-08-11 | 2 | -13/+29 |
|\ | | | | | | | Optimize indentation for generator actions | ||||
| * | Optimize indentation for generator actions | Yoshiyuki Hirano | 2017-08-11 | 2 | -13/+29 |
| | | |||||
* | | Merge pull request #30114 from yhirano55/remove_empty_line_from_dummy_manifest | Rafael França | 2017-08-11 | 1 | -1/+0 |
|\ \ | | | | | | | Removed empty line from dummy_manifest | ||||
| * | | Removed empty line from dummy_manifest | Yoshiyuki Hirano | 2017-08-07 | 1 | -1/+0 |
| | | | |||||
* | | | Merge pull request #30116 from ↵ | Rafael Mendonça França | 2017-08-11 | 1 | -0/+15 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | yhirano55/skip_unused_components_when_running_rails_command_in_plugin Skip unused components when running `bin/rails` in Rails plugin | ||||
| * | | | Skip unused components when running in Rails plugin | Yoshiyuki Hirano | 2017-08-09 | 1 | -0/+15 |
| | | | | |||||
* | | | | Merge pull request #30110 from yhirano55/add_git_source | Rafael Mendonça França | 2017-08-11 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | Add git_source to Gemfile for plugin generator | ||||
| * | | | | Add git_source to Gemfile for plugin generator | Yoshiyuki Hirano | 2017-08-09 | 1 | -0/+1 |
| |/ / / | |||||
* | | | | Merge pull request #30092 from bogdanvlviv/prevent-generation-extra-empty-lines | Rafael França | 2017-08-11 | 2 | -7/+6 |
|\ \ \ \ | |_|_|/ |/| | | | Prevent generation extra empty lines in a plugin's Rakefile | ||||
| * | | | Prevent generation extra empty lines in a plugin's Rakefile | bogdanvlviv | 2017-08-09 | 2 | -7/+6 |
| | | | | |||||
* | | | | `--skip-action-cable` pass throughs `rails plugin new` | bogdanvlviv | 2017-08-10 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #30091 from yhirano55/fix_engine_command | Rafael França | 2017-08-08 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | Fix engine command | ||||
| * | | | | Fix engine command | Yoshiyuki Hirano | 2017-08-06 | 1 | -0/+2 |
| |/ / / | |||||
* | | | | Merge pull request #30088 from y-yagi/use_the_same_key_as_presented_in_doc | Rafael França | 2017-08-08 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Use the same key as presented in doc | ||||
| * | | | | Use the same key as presented in doc | yuuji.yaginuma | 2017-08-09 | 1 | -1/+1 |
| | |/ / | |/| | | | | | | | | | | Ref: https://github.com/rails/rails/blob/a8217bb594a625fb46a6af1488c0bde4aeac4986/railties/lib/rails/generators/rails/app/templates/config/storage.yml#L24 | ||||
* | | | | Merge pull request #30115 from ↵ | Rafael França | 2017-08-08 | 1 | -4/+6 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | intrip/30049-application-controller-renderer-defaults-automatic-reload-in-dev Fix ApplicationController.renderer.defaults overriding in development | ||||
| * | | | Fix ApplicationController.renderer.defaults overriding in development | Jacopo | 2017-07-20 | 1 | -4/+6 |
| | |/ | |/| | | | | | | | | | | | | | | | | Previously overriding ApplicationController.renderer.defaults wasn't working effectively in development. In fact the override was unset every time the code was reloaded. The solution is to wrap the code in a `.to_prepare` block. | ||||
* | | | Merge pull request #30123 from yhirano55/fix_dummy_app_configuration | Rafael França | 2017-08-08 | 1 | -3/+5 |
|\ \ \ | | | | | | | | | Fix dummy_app configuration | ||||
| * | | | Fix dummy_app configuration | Yoshiyuki Hirano | 2017-08-08 | 1 | -3/+5 |
| |/ / | |||||
* | | | Merge pull request #30122 from yhirano55/use_with_dummy_app_in_gitignore | Rafael França | 2017-08-08 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Use `with_dummy_app?` in gitignore | ||||
| * | | | Use `with_dummy_app?` in gitignore | Yoshiyuki Hirano | 2017-08-08 | 1 | -1/+1 |
| |/ / | |||||
* / / | Deprecate support of older `config.ru` | yuuji.yaginuma | 2017-08-08 | 1 | -1/+8 |
|/ / | | | | | | | | | | | | | | | Since Rails 4.0, `config.ru` generated by default uses instances of `Rails.application`. Therefore, I think that it is good to deprecate the old behavior. Related: #9669 | ||||
* / | Fix wrong service name in the storage.yml | dixpac | 2017-08-06 | 1 | -3/+3 |
|/ | |||||
* | Add missing blank line between `config.active_storage` and `config.action_cable` | Ryuta Kamizono | 2017-08-05 | 1 | -0/+1 |
| | |||||
* | Merge pull request #30020 from rails/active-storage-import | David Heinemeier Hansson | 2017-08-04 | 11 | -3/+71 |
|\ | | | | | Add Active Storage to Rails | ||||
| * | Include active_storage in all generated application.rb files | David Heinemeier Hansson | 2017-08-04 | 2 | -0/+2 |
| | | | | | | | | And deal with a temporary test fix until we allow you to skip active storage. | ||||
| * | Merge branch 'master' into active-storage-import | David Heinemeier Hansson | 2017-08-01 | 5 | -7/+8 |
| |\ | |||||
| * | | Prevent interpolation of ERB elements | David Heinemeier Hansson | 2017-08-01 | 1 | -6/+6 |
| | | | |||||
| * | | Add the storage.yml file by default | David Heinemeier Hansson | 2017-08-01 | 1 | -0/+1 |
| | | | |||||
| * | | We moved to storage.yml | David Heinemeier Hansson | 2017-08-01 | 2 | -35/+1 |
| | | | |||||
| * | | Add Azure configuration to Active Storage template | Mike Gunderloy | 2017-08-01 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | With Active Storage supporting Azure, we should show people how to set it up. Incorporates the minor changes originally in https://github.com/rails/activestorage/pull/88 as well | ||||
| * | | Create the skeleton directories needed and ignore accordingly | David Heinemeier Hansson | 2017-07-31 | 2 | -0/+8 |
| | | | |||||
| * | | Load activestorage by default | David Heinemeier Hansson | 2017-07-31 | 2 | -0/+8 |
| | | | |||||
| * | | Use config/storage.yml as part of the skeleton and loading | David Heinemeier Hansson | 2017-07-31 | 4 | -5/+44 |
| | | | |||||
| * | | Require activestorage per default with asset pipeline | David Heinemeier Hansson | 2017-07-31 | 1 | -0/+1 |
| | | | |||||
| * | | Include default storage configuration | David Heinemeier Hansson | 2017-07-31 | 4 | -0/+35 |
| | | | |||||
* | | | Merge pull request #30058 from ↵ | Rafael França | 2017-08-04 | 1 | -1/+5 |
|\ \ \ | | | | | | | | | | | | | | | | | y-yagi/use_assert_nil_if_value_is_nil_in_assert_field_default_value_ Use `assert_nil` if `value` is nil in `assert_field_default_value` | ||||
| * | | | Use `assert_nil` if `value` is nil in `assert_field_default_value` | yuuji.yaginuma | 2017-08-03 | 1 | -1/+5 |
| | |/ | |/| | | | | | | | | | | It is deprecate to specify nil for expect argument of `assert_equal`. Ref: https://github.com/seattlerb/minitest/commit/922bc9151a622cb3ef0b9f170aa09c3bb72c7eb8 | ||||
* | | | Merge pull request #30022 from y-yagi/remove_extra_empty_line | Eileen M. Uchitelle | 2017-08-04 | 1 | -1/+5 |
|\ \ \ | | | | | | | | | Remove extra empty line | ||||
| * | | | Remove extra empty line | yuuji.yaginuma | 2017-08-02 | 1 | -1/+5 |
| | |/ | |/| | |||||
* | | | Merge pull request #29967 from naw/binstub-error-msg | Richard Schneeman | 2017-08-03 | 1 | -5/+16 |
|\ \ \ | |_|/ |/| | | Improve bundler binstub error message | ||||
| * | | Revise bundle binstub error message | Nathan Wenneker | 2017-08-03 | 1 | -8/+13 |
| | | | |||||
| * | | Improve bundler binstub error message | Nathan Wenneker | 2017-07-26 | 1 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails displays an error message if you have a bundler-generated binstub at `./bin/rails` instead of a Rails-generated binstub. This error message is misleading because it makes it seem as though Rails 5 introduced recent changes in how binstubs are used, when these changes were actually introduced way back in Rails 4. The suggested upgrade steps are appropriate for an app that was created in Rails 3, but they likely aren't the correct fix for someone who sees this error message today on a modern app. I believe the `--binstubs` option on bundler is a more likely culprit and troubleshooting path. | ||||
* | | | Merge pull request #30015 from larskanis/use-duktake-on-mingw | Guillermo Iguaran | 2017-08-01 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Use duktape gem as default JS engine on Windows-MINGW | ||||
| * | | | Use duktape gem as default JS engine on Windows-MINGW and MS-Visual-C builds | Lars Kanis | 2017-08-01 | 1 | -0/+2 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | The fallback javascript engine on Windows is Windows Script Host (JScript). However this engine isn't able to process the default assets, because it supports ES3 only but the coffeescript compiler requires ES5. Fixes #30014 | ||||
* | | | Merge pull request #30023 from y-yagi/remove_unnecessary_doc_directory_deletion | Guillermo Iguaran | 2017-08-01 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | Remove unnecessary `doc` directory deletion | ||||
| * | | | Remove unnecessary `doc` directory deletion | yuuji.yaginuma | 2017-08-01 | 1 | -1/+0 |
| | |/ | |/| | | | | | | | Since 553b695, `doc` directory is not created in application. | ||||
* | | | Merge pull request #30029 from yhirano55/fix_rails_command_comments | Sean Griffin | 2017-08-01 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | [ci skip] Fix rails_command comments | ||||
| * | | | [ci skip] Fix rails_command comments | Yoshiyuki Hirano | 2017-08-01 | 1 | -3/+3 |
| | |/ | |/| | |||||
* | | | Fix rubocop style issues in yarn and spring.rb templates" | roberts1000 | 2017-07-31 | 2 | -3/+3 |
| |/ |/| |