aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #30091 from yhirano55/fix_engine_commandRafael França2017-08-082-0/+6
|\
| * Fix engine commandYoshiyuki Hirano2017-08-062-0/+6
* | Merge pull request #30088 from y-yagi/use_the_same_key_as_presented_in_docRafael França2017-08-081-1/+1
|\ \
| * | Use the same key as presented in docyuuji.yaginuma2017-08-091-1/+1
* | | Merge pull request #30090 from yhirano55/fix_escaped_characterRafael França2017-08-081-1/+1
|\ \ \
| * | | Fix escaped characterYoshiyuki Hirano2017-08-061-1/+1
| | |/ | |/|
* | | Merge pull request #30115 from intrip/30049-application-controller-renderer-d...Rafael França2017-08-081-4/+6
|\ \ \ | |_|/ |/| |
| * | Fix ApplicationController.renderer.defaults overriding in developmentJacopo2017-07-201-4/+6
* | | Merge pull request #30123 from yhirano55/fix_dummy_app_configurationRafael França2017-08-081-3/+5
|\ \ \
| * | | 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 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`yuuji.yaginuma2017-08-083-1/+43
* | | | ActiveStorage:Add migrations per rails engine conventions (#30111)Dino Maric2017-08-081-2/+2
| |/ / |/| |
* | | Lint railties/CHANGELOG.mdJon Moss2017-08-061-2/+2
|/ /
* / 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
|\
| * Check for `app.secrets.secret_key_base`, not `app.config.secret_key_base`George Claghorn2017-08-051-3/+1
* | 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
|\
| * Make sure the test fails if the code chagesRafael Mendonça França2017-08-041-8/+10
| * Do not call isolate_namespace on the applicationRafael Mendonça França2017-08-041-1/+9
| * Include active_storage in all generated application.rb filesDavid Heinemeier Hansson2017-08-043-1/+4
| * 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
| * Active Storage routes are now part of the default routesDavid Heinemeier Hansson2017-08-031-9/+37
| * Same issue from AR getting loaded earlierDavid Heinemeier Hansson2017-08-031-3/+3
| * 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
| * | | 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 y-yagi/use_assert_nil_if_value_is_nil_in_asser...Rafael França2017-08-041-1/+5
|\ \ \ \
| * | | | Use `assert_nil` if `value` is nil in `assert_field_default_value`yuuji.yaginuma2017-08-031-1/+5
| | |_|/ | |/| |
* | | | Merge pull request #30022 from y-yagi/remove_extra_empty_lineEileen M. Uchitelle2017-08-041-1/+5
|\ \ \ \
| * | | | Remove extra empty lineyuuji.yaginuma2017-08-021-1/+5
| | |/ / | |/| |
* | | | Merge pull request #29967 from naw/binstub-error-msgRichard Schneeman2017-08-031-5/+16
|\ \ \ \
| * | | | Revise bundle binstub error messageNathan Wenneker2017-08-031-8/+13
| * | | | Improve bundler binstub error messageNathan Wenneker2017-07-261-3/+9