Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | 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 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #30127 from y-yagi/deprecate_support_of_older_config_ru | Rafael França | 2017-08-08 | 3 | -1/+43 | |
|\ \ \ \ \ | | | | | | | | | | | | | Deprecate support of older `config.ru` | |||||
| * | | | | | Deprecate support of older `config.ru` | yuuji.yaginuma | 2017-08-08 | 3 | -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 Maric | 2017-08-08 | 1 | -2/+2 | |
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | * Add migrations per rails engine conventions * Fix failing tests | |||||
* | | | | | Lint railties/CHANGELOG.md | Jon Moss | 2017-08-06 | 1 | -2/+2 | |
|/ / / / | | | | | | | | | | | | | | | | | | | | | Light grammar edits. [ci skip] | |||||
* / / / | Fix wrong service name in the storage.yml | dixpac | 2017-08-06 | 1 | -3/+3 | |
|/ / / | ||||||
* | | | Merge pull request #30080 from georgeclaghorn/active-storage-secret-key-base | David Heinemeier Hansson | 2017-08-05 | 1 | -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 Claghorn | 2017-08-05 | 1 | -3/+1 | |
| |/ / | | | | | | | | | | By default, apps only have the former set. | |||||
* / / | 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 | 17 | -19/+127 | |
|\ \ | | | | | | | Add Active Storage to Rails | |||||
| * | | Make sure the test fails if the code chages | Rafael Mendonça França | 2017-08-04 | 1 | -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 application | Rafael Mendonça França | 2017-08-04 | 1 | -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 files | David Heinemeier Hansson | 2017-08-04 | 3 | -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 deterministically | David Heinemeier Hansson | 2017-08-04 | 1 | -3/+3 | |
| | | | ||||||
| * | | Deterministic comparisons please | David Heinemeier Hansson | 2017-08-03 | 1 | -3/+3 | |
| | | | ||||||
| * | | Do not eager load ActiveRecord::Base | Rafael Mendonça França | 2017-08-03 | 2 | -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 routes | David Heinemeier Hansson | 2017-08-03 | 1 | -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 earlier | David Heinemeier Hansson | 2017-08-03 | 1 | -3/+3 | |
| | | | | | | | | | | | | cc @rafaelfranca | |||||
| * | | Including new default classes in loading test | David Heinemeier Hansson | 2017-08-03 | 1 | -3/+3 | |
| | | | ||||||
| * | | Active Storage loads AR earlier to extend it so require env later | David Heinemeier Hansson | 2017-08-03 | 1 | -3/+7 | |
| | | | ||||||
| * | | Generating the app is where the exception is now raised | David Heinemeier Hansson | 2017-08-03 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master' into active-storage-import | David Heinemeier Hansson | 2017-08-02 | 3 | -3/+3 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'master' into active-storage-import | David Heinemeier Hansson | 2017-08-01 | 7 | -8/+10 | |
| |\ \ \ | ||||||
| * | | | | 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 | 5 | -6/+45 | |
| | | | | | ||||||
| * | | | | 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 | 5 | -0/+36 | |
| | | | | | ||||||
* | | | | | 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 #30011 from guilherme/fix-migration-generator-special-cases | Sean Griffin | 2017-08-03 | 1 | -0/+22 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Handling add/remove to/from migration edge cases | |||||
| * | | | | Handling add/remove to/from migration edge cases | Guilherme Reis Campos | 2017-08-03 | 1 | -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-minitest | Rafael Mendonça França | 2017-08-01 | 59 | -490/+827 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | Merge pull request #30015 from larskanis/use-duktake-on-mingw | Guillermo Iguaran | 2017-08-01 | 2 | -0/+4 | |
| |\ \ \ \ | | | | | | | | | | | | | 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 | 2 | -0/+4 | |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -2/+0 | |
| |\ \ \ \ | | | | | | | | | | | | | Remove unnecessary `doc` directory deletion | |||||
| | * | | | | Remove unnecessary `doc` directory deletion | yuuji.yaginuma | 2017-08-01 | 2 | -2/+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 |