aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | All test cases for `exists?` places in `finder_test.rb` to ease to find the ↵Ryuta Kamizono2017-10-092-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | test cases
* | | | | | | Merge pull request #30839 from yhirano55/use_form_with_in_engine_guideRyuta Kamizono2017-10-092-9/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use `form_with` instead of `form_for` in engine guide [ci skip]
| * | | | | | | Use `form_with` instead of `form_for` in engine guide [ci skip]Yoshiyuki Hirano2017-10-092-9/+9
| | |/ / / / / | |/| | | | |
* | | | | | | Remove meaningless named `construct_relation_for_association_calculations`Ryuta Kamizono2017-10-092-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't think this is a good abstraction because the internal method is used only if the relation need to be applied join dependency.
* | | | | | | Merge pull request #30838 from ↵Ryuta Kamizono2017-10-091-19/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | yhirano55/fix_rails_routes_log_in_getting_started_guide Fix the result of `rails routes` in Guide [ci skip]
| * | | | | | | Fix the result of `rails routes` in Guide [ci skip]Yoshiyuki Hirano2017-10-091-19/+21
| |/ / / / / /
* | | | | | | Fix `relation.exists?` with has_many through associationsRyuta Kamizono2017-10-092-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `relation.exists?` should reference correct aliases while joining tables of has_many through associations.
* | | | | | | Missing revision 5efd21bb7ee4b326d9c0d26fccad10fc59dd51f0 in redis-rb-4.0 branchRyuta Kamizono2017-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems the branch has rebased. cc @jeremy
* | | | | | | Merge pull request #30837 from y-yagi/fix_typo_in_loading_errorRyuta Kamizono2017-10-091-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix typo in loading error message
| * | | | | | | Fix typo in loading error messageyuuji.yaginuma2017-10-091-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | s/Action Record/Active Record/
* | | | | | | Merge pull request #30748 from jeremy/redis-rb-4.0.1Jeremy Daer2017-10-089-30/+59
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | redis-rb 4.0 support
| * | | | | | | redis-rb 4.0 supportJeremy Daer2017-10-089-30/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use `gem 'redis', '~> 4.0'` for new app Gemfiles * Loosen Action Cable redis-rb dep to `>= 3.3, < 5` * Bump redis-namespace for looser Redis version dep * Avoid using the underlying `redis.client` directly * Use `Redis.new` instead of `Redis.connect`
* | | | | | | | Merge pull request #30757 from jeremy/optional-dependency-hellscapeJeremy Daer2017-10-083-7/+32
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Adapters bubble up gem version mismatches for their dependencies
| * | | | | | | | Distinguish missing adapter gems from load errors within the adapterJeremy Daer2017-10-083-7/+32
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * When the adapter is missing, raise an exception that points out config typos and missing Gemfile entries. (We can assume that a non-builtin adapter was used since these are always available.) * When loading an adapter raises a LoadError, prefix its error message to indicate that the adapter is likely missing an optional dependency.
* | | | | | | | Remove passing redundant `self` to internal `apply_join_dependency` etcRyuta Kamizono2017-10-091-13/+12
| | | | | | | |
* | | | | | | | Merge pull request #30789 from erichmachado/file-store-cache-cleanup-fixGeorge Claghorn2017-10-082-3/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Fixes ActiveSupport::Cache::FileStore#cleanup bug which prevented it from removing expired entries
| * | | | | | | Fixes ActiveSupport::Cache::FileStore#cleanup bug which prevented it from ↵Erich Soares Machado2017-10-032-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleaning up the expired cache keys
* | | | | | | | Merge pull request #30802 from khall/30662_long_variant_filenamesGeorge Claghorn2017-10-082-1/+6
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Break long variant filenames into path chunks
| * | | | | | | Replace variation key use with SHA256 of key to prevent long filenameskhall2017-10-052-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a variant has a large set of options associated with it, the generated filename will be too long, causing Errno::ENAMETOOLONG to be raised. This change replaces those potentially long filenames with a much more compact SHA256 hash. Fixes #30662.
* | | | | | | | Merge pull request #30817 from yalab/friendly_exception_messageEileen M. Uchitelle2017-10-082-6/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Exception message for SystemTestCase#get etc..
| * | | | | | | | Exception message for SystemTestCase#get etc..yalab2017-10-082-6/+11
| | | | | | | | |
* | | | | | | | | Decouple building `AliasTracker` from `JoinDependency`Ryuta Kamizono2017-10-087-17/+16
| |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is preparation to respect parent relation's alias tracking for fixing #30681.
* | | | | | | | Merge pull request #30831 from masatooba/fix-radio-button-tag-commentEileen M. Uchitelle2017-10-081-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix radio_button_tag comment
| * | | | | | | | Fix radio_button_tag commentMasato Oba2017-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Colons, periods, etc. can also be included in id. The sanitize_to_id method does not remove them.
* | | | | | | | | Merge pull request #30835 from y-yagi/fix_default_of_to_timeRyuta Kamizono2017-10-081-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | Fix default of `String#to_time` [ci skip]
| * | | | | | | | Fix default of `String#to_time` [ci skip]yuuji.yaginuma2017-10-081-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | The default of `String#to_time` is `:local` since b79adc4.
* | | | | | | | Merge pull request #30822 from akshay-vishnoi/fix-typoRyuta Kamizono2017-10-072-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ci skip] Fix typo
| * | | | | | | | [ci skip] Fix typoAkshay Vishnoi2017-10-072-2/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #30826 from ↵Ryuta Kamizono2017-10-071-0/+47
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | yhirano55/update_instrumentation_guide_for_active_storage Update Instrumentation guide for Active Storage [ci skip]
| * | | | | | | | | Update Instrumentation guide for Active Storage [ci skip]Yoshiyuki Hirano2017-10-071-0/+47
| | | | | | | | | |
* | | | | | | | | | Merge pull request #30825 from y-yagi/remove_needless_setupRyuta Kamizono2017-10-071-13/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Remove needless setup from `InfoTest`
| * | | | | | | | | Remove needless setup from `InfoTest`yuuji.yaginuma2017-10-071-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `abstract_unit` loads `rails/all`. Therefore, `Rails` is definitely defined. Also, since `Info` is autoloaded, do not need to explicitly load the file. https://github.com/rails/rails/blob/3ede539357acc91e377611cea9dd5f30678e7b2a/railties/lib/rails.rb#L29
* | | | | | | | | | Merge pull request #30824 from yhirano55/add_earlier_releases_listप्रथमेश Sonpatki2017-10-071-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Add v5.1 to earlier releases list in guide [ci skip]
| * | | | | | | | | Add v5.1 to earlier releases list in guide [ci skip]Yoshiyuki Hirano2017-10-071-0/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #30816 from ydakuka/cosmetic-fixesEileen M. Uchitelle2017-10-0616-25/+25
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Missing backquotes in the guides
| * | | | | | | | Cosmetic fixes [ci skip]Yauheni Dakuka2017-10-0616-25/+25
|/ / / / / / / /
* | | | | | | | Merge pull request #30812 from ahorek/request_checkRafael França2017-10-051-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | link tags shouldn't depend on the request
| * | | | | | | request checkpavel2017-10-051-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #30809 from meganemura/use-calleeRafael França2017-10-051-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use __callee__ to pass alias instead of original method name
| * | | | | | | Use __callee__ to pass alias instead of original method namemeganemura2017-10-051-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before ``` > Article.left_joins ArgumentError: The method .left_outer_joins() must contain arguments. ``` After ``` > Article.left_joins ArgumentError: The method .left_joins() must contain arguments. ```
* | | | | | | Move duplicated code to `delete_or_destroy` in `CollectionAssociation`Ryuta Kamizono2017-10-061-4/+2
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #30702 from rmachielse/patch-1Ryuta Kamizono2017-10-051-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | ActionCable: use find method when unsubscribing
| * | | | | | ActionCable: use find method when unsubscribingRichard Machielse2017-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a frontend for some reason tries to unsubscribe from a non existing subscription, the following error is logged: Could not execute command from ({"command"=>"unsubscribe", "identifier"=>"{\"channel\":\"SomeChannel\"}"}) [NoMethodError - undefined method `unsubscribe_from_channel' for nil:NilClass] Instead, it will now properly log: Could not execute command from ({"command"=>"unsubscribe", "identifier"=>"{\"channel\":\"SomeChannel\"}"}) [RuntimeError - Unable to find subscription with identifier: {"channel":"SomeChannel"}]
* | | | | | | Add JSON attribute test cases for SQLite3 adapterRyuta Kamizono2017-10-054-1/+33
| | | | | | |
* | | | | | | Extract repeatedly appeared prepending compatible table definitionRyuta Kamizono2017-10-051-25/+24
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #30744 from eileencodes/early-hintsEileen M. Uchitelle2017-10-048-6/+93
|\ \ \ \ \ \ | | | | | | | | | | | | | | Implement H2 Early Hints for Rails
| * | | | | | Implement H2 Early Hints for Railseileencodes2017-10-048-6/+93
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When puma/puma#1403 is merged Puma will support the Early Hints status code for sending assets before a request has finished. While the Early Hints spec is still in draft, this PR prepares Rails to allowing this status code. If the proxy server supports Early Hints, it will send H2 pushes to the client. This PR adds a method for setting Early Hints Link headers via Rails, and also automatically sends Early Hints if supported from the `stylesheet_link_tag` and the `javascript_include_tag`. Once puma supports Early Hints the `--early-hints` argument can be passed to the server to enable this or set in the puma config with `early_hints(true)`. Note that for Early Hints to work in the browser the requirements are 1) a proxy that can handle H2, and 2) HTTPS. To start the server with Early Hints enabled pass `--early-hints` to `rails s`. This has been verified to work with h2o, Puma, and Rails with Chrome. The commit adds a new option to the rails server to enable early hints for Puma. Early Hints spec: https://tools.ietf.org/html/draft-ietf-httpbis-early-hints-04 [Eileen M. Uchitelle, Aaron Patterson]
* | | | | | Merge pull request #30734 from oreoshake/patch-1Eileen M. Uchitelle2017-10-041-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Encourage html-safe API in layouts/rendering guide
| * | | | | Encourage html-safe API in layouts/rendering guideNeil Matatall2017-09-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While the code example was not unsafe, it encourages the use of confusingly unsafe APIs (specifically `html_safe`). We have a safe alternative and we should encourage people to use it under all circumstances.
* | | | | | Merge pull request #30797 from y-yagi/fix_formatting_of_use_zoneRyuta Kamizono2017-10-041-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix formatting of `Time.use_zone` [ci skip]