aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #30091 from yhirano55/fix_engine_commandRafael França2017-08-082-0/+6
|\ | | | | Fix engine command
| * 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 doc
| * | 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 #30108 from yui-knk/require_concurrent_mapRafael França2017-08-081-0/+2
|\ \ \ | | | | | | | | Add missed `require`
| * | | Add missed `require`yui-knk2017-08-071-0/+2
| | | | | | | | | | | | | | | | | | | | `ActiveRecord::ConnectionAdapters::QueryCache::ConnectionPoolConfiguration` depends on `Concurrent::Map`.
* | | | Merge pull request #30112 from dixpac/filter_minitest_backtraceRafael França2017-08-081-0/+4
|\ \ \ \ | | | | | | | | | | ActiveStorage:Filter out Minitest backtrace.
| * | | | Filter out Minitest backtrace.dixpac2017-08-071-0/+4
| |/ / / | | | | | | | | | | | | | | | | Filter out Minitest backtrace while allowing backtrace from other libraries to be shown.
* | | | Merge pull request #30109 from koic/simplify_git_source_in_gemfileRafael França2017-08-081-4/+1
|\ \ \ \ | | | | | | | | | | Simplify `git_source` in Gemfile
| * | | | Simplify `git_source` in GemfileKoichi ITO2017-08-071-4/+1
| |/ / / | | | | | | | | | | | | Follow up of https://github.com/rails/rails/commit/0b8441bd415c444b8d4afbfc93af79ec7677aa2c
* | | | Merge pull request #30104 from trev/deprecate-actiondispatch-testresponse-aliasRafael França2017-08-083-3/+36
|\ \ \ \ | | | | | | | | | | Deprecate ActionDispatch::TestResponse response aliases
| * | | | Deprecate ActionDispatch::TestResponse response aliasesTrevor Wistaff2017-08-073-3/+36
| |/ / / | | | | | | | | | | | | https://github.com/rails/rails/issues/30072
* | | | Merge pull request #29767 from yui-knk/ac_testRafael França2017-08-081-7/+2
|\ \ \ \ | | | | | | | | | | Remove needless restoring of `default_charset`
| * | | | Remove needless restoring of `default_charset`yui-knk2017-07-131-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `default_charset` is not changed in this test case, so we do not need to backup an original value and restore it.
* | | | | 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 #30142 from ↵Sean Griffin2017-08-082-6/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | yukideluxe/add-missing-bit-reload-associations-docs add missing collection.reload documentation [ci skip]
| * | | | add missing collection.reload documentation [ci skip]Julia López2017-08-082-6/+36
| | | | |
* | | | | Merge pull request #30133 from kamipo/fix_random_ci_failureRafael França2017-08-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix random CI failure due to non-deterministic sorting order
| * | | | | Fix random CI failure due to non-deterministic sorting orderRyuta Kamizono2017-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It should be sorted to be deterministic executed result. ``` % bundle exec rake test_postgresql --verbose TESTOPTS="--seed=52812" (snip) Failure: HasManyThroughAssociationsTest#test_has_many_association_through_a_has_many_association_to_self [/Users/kamipo/src/github.com/rails/rails/activerecord/test/cases/associations/has_many_through_associations_test.rb:820]: --- expected +++ actual @@ -1 +1 @@ -[#<Person id: 85, primary_contact_id: 84, gender: "M", number1_fan_id: 1, lock_version: 0, comments: nil, followers_count: 0, friends_too_count: 0, best_friend_id: nil, best_friend_of_id: nil, insures: 0, born_at: nil, created_at: "2017-08-08 07:33:52", updated_at: "2017-08-08 07:33:52", first_name: "John">, #<Person id: 1, primary_contact_id: 2, gender: "M", number1_fan_id: 3, lock_version: 0, comments: nil, followers_count: 1, friends_too_count: 1, best_friend_id: nil, best_friend_of_id: nil, insures: 0, born_at: nil, created_at: "2017-08-08 07:33:49", updated_at: "2017-08-08 07:33:49", first_name: "Michael">, #<Person id: 3, primary_contact_id: 2, gender: "F", number1_fan_id: 1, lock_version: 0, comments: nil, followers_count: 1, friends_too_count: 1, best_friend_id: nil, best_friend_of_id: nil, insures: 0, born_at: nil, created_at: "2017-08-08 07:33:49", updated_at: "2017-08-08 07:33:49", first_name: "Susan">] +#<ActiveRecord::Associations::CollectionProxy [#<Person id: 1, primary_contact_id: 2, gender: "M", number1_fan_id: 3, lock_version: 0, comments: nil, followers_count: 1, friends_too_count: 1, best_friend_id: nil, best_friend_of_id: nil, insures: 0, born_at: nil, created_at: "2017-08-08 07:33:49", updated_at: "2017-08-08 07:33:49", first_name: "Michael">, #<Person id: 3, primary_contact_id: 2, gender: "F", number1_fan_id: 1, lock_version: 0, comments: nil, followers_count: 1, friends_too_count: 1, best_friend_id: nil, best_friend_of_id: nil, insures: 0, born_at: nil, created_at: "2017-08-08 07:33:49", updated_at: "2017-08-08 07:33:49", first_name: "Susan">, #<Person id: 85, primary_contact_id: 84, gender: "M", number1_fan_id: 1, lock_version: 0, comments: nil, followers_count: 0, friends_too_count: 0, best_friend_id: nil, best_friend_of_id: nil, insures: 0, born_at: nil, created_at: "2017-08-08 07:33:52", updated_at: "2017-08-08 07:33:52", first_name: "John">]> ```
* | | | | | 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 #30118 from georgeclaghorn/active-storage-load-hooksRafael França2017-08-081-16/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Set ActiveStorage::Blob.service when ActiveStorage::Blob is loaded
| * | | | | | | Set ActiveStorage::Blob.service when ActiveStorage::Blob is loadedGeorge Claghorn2017-08-081-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes that ActiveStorage::Blob.service is unset when ActiveStorage::Blob is reloaded.
* | | | | | | | Document `ActiveRecord::AttributeMethods::Dirty`Sean Griffin2017-08-081-9/+9
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This module has behavior that is not present in `ActiveModel::Dirty`, which is intended to be public API.
* | | | | | | Merge pull request #30125 from yukideluxe/add-reload-to-associations-docsRafael França2017-08-082-4/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | add reload_association to documentation
| * | | | | | | add reload_association to documentation [ci skip]Julia López2017-08-072-4/+14
| | |/ / / / / | |/| | | | |
* | | | | | | 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
* | | | | | | | Merge pull request #30135 from ffmike/azure-storage-fix-content-typeRafael Mendonça França2017-08-082-3/+11
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | Support content_type in AzureStorageService#url
| * | | | | | | Support content_type in AzureStorageService#urlMike Gunderloy2017-08-082-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add in the content_type option, which is defined as part of the generic ActiveStorage::Service class. Without this option, attempts to generate a URL for an attached file fail with "ArgumentError (unknown keyword: content_type)"
* | | | | | | | ActiveStorage:Add migrations per rails engine conventions (#30111)Dino Maric2017-08-084-14/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add migrations per rails engine conventions * Fix failing tests
* | | | | | | [ci skip] Postgres --> PostgreSQLRyuta Kamizono2017-08-084-4/+4
| | | | | | |
* | | | | | | Merge pull request #30132 from ydakuka/patch-1Ryuta Kamizono2017-08-081-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | [ci skip] Update action_mailer_basics.md
| * | | | | | [ci skip] Update action_mailer_basics.mdYauheni Dakuka2017-08-081-1/+1
|/ / / / / /
* | / / / / [ci skip] Prefer cookies.encrypted over signed (#30129)Claudio B2017-08-074-4/+4
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some examples and guides we are recommending to use code like: ```ruby verified_user = User.find_by(id: cookies.signed[:user_id]) ``` My suggestion is to use instead: ```ruby verified_user = User.find_by(id: cookies.encrypted[:user_id]) ``` which invites users to prefer the "newer" encrypted cookies over the "legacy" signed cookies.
* | | | | Extend image_tag to accept ActiveStorage Attachments and Variants (#30084)Anton Khamets2017-08-075-6/+66
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Extend image_tag to accept ActiveStorage's Attachments and Variants * Flip resolve_image_source around * Add tests for the new use-cases of image_tag * Remove the higher-level test * Update image_tag documentation * Add error states into the test suite * Re-raise polymorhic_url's NoMethodError as ArgumentError * delegate_missing_to will raise DelegationError instead of NoMethodError
* | | | Capitalize RakeJon Moss2017-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Should _probably_ be done across the board with all of our documentation, but going to leave that for another time :) [ci skip]
* | | | Remove extra space between two sentencesJon Moss2017-08-061-1/+1
| | | | | | | | | | | | | | | | [ci skip]
* | | | Lint railties/CHANGELOG.mdJon Moss2017-08-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Light grammar edits. [ci skip]
* | | | Lint activesupport/CHANGELOG.mdJon Moss2017-08-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Light grammar edits. [ci skip]
* | | | Lint activerecord/CHANGELOG.mdJon Moss2017-08-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Light grammar fixes, and added a few backticks. [ci skip]
* | | | Lint actionpack/CHANGELOG.mdJon Moss2017-08-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fixes a few grammar things. [ci skip]
* | | | Lint actioncable/CHANGELOG.mdJon Moss2017-08-061-3/+3
|/ / / | | | | | | | | | | | | | | | | | | Postgres --> PostgreSQL ActionCable --> Action Cable [ci skip]
* | | Merge pull request #30094 from dixpac/change_azure_name_in_storage_ymlDavid Heinemeier Hansson2017-08-061-3/+3
|\ \ \ | | | | | | | | Fix wrong service name in the storage.yml
| * | | Fix wrong service name in the storage.ymldixpac2017-08-061-3/+3
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 15:56:54 +0000