aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Use the same key as presented in docyuuji.yaginuma2017-08-091-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | Ref: https://github.com/rails/rails/blob/a8217bb594a625fb46a6af1488c0bde4aeac4986/railties/lib/rails/generators/rails/app/templates/config/storage.yml#L24
* | | | | | Merge pull request #30090 from yhirano55/fix_escaped_characterRafael França2017-08-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix non escaped character
| * | | | | | Fix escaped characterYoshiyuki Hirano2017-08-061-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #30115 from ↵Rafael França2017-08-081-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 developmentJacopo2017-07-201-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_configurationRafael França2017-08-081-3/+5
|\ \ \ \ \ | | | | | | | | | | | | Fix dummy_app configuration
| * | | | | Fix dummy_app configurationYoshiyuki Hirano2017-08-081-3/+5
| |/ / / /
* | | | | Merge pull request #30122 from yhirano55/use_with_dummy_app_in_gitignoreRafael França2017-08-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Use `with_dummy_app?` in gitignore
| * | | | | Use `with_dummy_app?` in gitignoreYoshiyuki Hirano2017-08-081-1/+1
| |/ / / /
* | | | | Merge pull request #30127 from y-yagi/deprecate_support_of_older_config_ruRafael França2017-08-083-1/+43
|\ \ \ \ \ | | | | | | | | | | | | Deprecate support of older `config.ru`
| * | | | | Deprecate support of older `config.ru`yuuji.yaginuma2017-08-083-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | ActiveStorage:Add migrations per rails engine conventions (#30111)Dino Maric2017-08-081-2/+2
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | * Add migrations per rails engine conventions * Fix failing tests
* | | | | Lint railties/CHANGELOG.mdJon Moss2017-08-061-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | Light grammar edits. [ci skip]
* / / / Fix wrong service name in the storage.ymldixpac2017-08-061-3/+3
|/ / /
* | | Merge pull request #30080 from georgeclaghorn/active-storage-secret-key-baseDavid Heinemeier Hansson2017-08-051-3/+1
|\ \ \ | | | | | | | | Active Storage: check for `app.secrets.secret_key_base`, not `app.config.secret_key_base`
| * | | Check for `app.secrets.secret_key_base`, not `app.config.secret_key_base`George Claghorn2017-08-051-3/+1
| |/ / | | | | | | | | | By default, apps only have the former set.
* / / Add missing blank line between `config.active_storage` and `config.action_cable`Ryuta Kamizono2017-08-051-0/+1
|/ /
* | Merge pull request #30020 from rails/active-storage-importDavid Heinemeier Hansson2017-08-0417-19/+127
|\ \ | | | | | | Add Active Storage to Rails
| * | Make sure the test fails if the code chagesRafael Mendonça França2017-08-041-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | The test was passing before because it was not being testes correctly. Now we create a different engine that is loaded before the already exising and we make sure that the first call for isolate_namespace is what takes effect.
| * | Do not call isolate_namespace on the applicationRafael Mendonça França2017-08-041-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | What we want to test is that two different calls to isolate_namespace with the same module doesn't change the original railtie. We can do that defining two different railties. We can't call in the application because this method is not supposed to be called in an Application class.
| * | Include active_storage in all generated application.rb filesDavid Heinemeier Hansson2017-08-043-1/+4
| | | | | | | | | | | | And deal with a temporary test fix until we allow you to skip active storage.
| * | Convert to strings so array can be sorted deterministicallyDavid Heinemeier Hansson2017-08-041-3/+3
| | |
| * | Deterministic comparisons pleaseDavid Heinemeier Hansson2017-08-031-3/+3
| | |
| * | Do not eager load ActiveRecord::BaseRafael Mendonça França2017-08-032-10/+6
| | | | | | | | | | | | Everything inside the app directory of a engine is autoload/eager loaded automatically so we don't need to require them.
| * | Active Storage routes are now part of the default routesDavid Heinemeier Hansson2017-08-031-9/+37
| | | | | | | | | | | | It's worth considering whether we should hide these by default, but I'm kinda thinking no. It's very reasonable that someone would want to call these directly, so they should be documented.
| * | Same issue from AR getting loaded earlierDavid Heinemeier Hansson2017-08-031-3/+3
| | | | | | | | | | | | cc @rafaelfranca
| * | Including new default classes in loading testDavid Heinemeier Hansson2017-08-031-3/+3
| | |
| * | Active Storage loads AR earlier to extend it so require env laterDavid Heinemeier Hansson2017-08-031-3/+7
| | |
| * | Generating the app is where the exception is now raisedDavid Heinemeier Hansson2017-08-031-1/+1
| | |
| * | Merge branch 'master' into active-storage-importDavid Heinemeier Hansson2017-08-023-3/+3
| |\ \
| * \ \ Merge branch 'master' into active-storage-importDavid Heinemeier Hansson2017-08-017-8/+10
| |\ \ \
| * | | | Prevent interpolation of ERB elementsDavid Heinemeier Hansson2017-08-011-6/+6
| | | | |
| * | | | Add the storage.yml file by defaultDavid Heinemeier Hansson2017-08-011-0/+1
| | | | |
| * | | | We moved to storage.ymlDavid Heinemeier Hansson2017-08-012-35/+1
| | | | |
| * | | | Add Azure configuration to Active Storage templateMike Gunderloy2017-08-011-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 accordinglyDavid Heinemeier Hansson2017-07-312-0/+8
| | | | |
| * | | | Load activestorage by defaultDavid Heinemeier Hansson2017-07-312-0/+8
| | | | |
| * | | | Use config/storage.yml as part of the skeleton and loadingDavid Heinemeier Hansson2017-07-315-6/+45
| | | | |
| * | | | Require activestorage per default with asset pipelineDavid Heinemeier Hansson2017-07-311-0/+1
| | | | |
| * | | | Include default storage configurationDavid Heinemeier Hansson2017-07-315-0/+36
| | | | |
* | | | | Merge pull request #30058 from ↵Rafael França2017-08-041-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.yaginuma2017-08-031-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_lineEileen M. Uchitelle2017-08-041-1/+5
|\ \ \ \ \ | | | | | | | | | | | | Remove extra empty line
| * | | | | Remove extra empty lineyuuji.yaginuma2017-08-021-1/+5
| | |/ / / | |/| | |
* | | | | Merge pull request #29967 from naw/binstub-error-msgRichard Schneeman2017-08-031-5/+16
|\ \ \ \ \ | | | | | | | | | | | | Improve bundler binstub error message
| * | | | | Revise bundle binstub error messageNathan Wenneker2017-08-031-8/+13
| | | | | |
| * | | | | Improve bundler binstub error messageNathan Wenneker2017-07-261-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 #30011 from guilherme/fix-migration-generator-special-casesSean Griffin2017-08-031-0/+22
|\ \ \ \ \ | |_|_|/ / |/| | | | Handling add/remove to/from migration edge cases
| * | | | Handling add/remove to/from migration edge casesGuilherme Reis Campos2017-08-031-0/+22
| | | | | | | | | | | | | | | | | | | | Making sure the table name is parsed correctly when an add/remove column migration have 'from'/'to' in the table name.
* | | | | Merge remote-tracking branch 'origin/master' into unlock-minitestRafael Mendonça França2017-08-0159-490/+827
|\ \ \ \ \ | | |_|_|/ | |/| | |