aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* 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]
| * | | Fix formatting of `Time.use_zone` [ci skip]yuuji.yaginuma2017-10-041-4/+4
|/ / /
* | | Cleanup CHANGELOGs [ci skip]Ryuta Kamizono2017-10-043-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Add missing credit * Add backticks * Fix indentation * Remove trailing spaces And some minor tweaks.
* | | Prefer official name PostgreSQL over PostgresRyuta Kamizono2017-10-041-2/+2
| | |
* | | Merge pull request #30794 from yhirano55/fix_third_party_libs_listRyuta Kamizono2017-10-041-2/+2
|\ \ \ | | | | | | | | Fix third-party system libraries list in ActiveStorage::Preview [ci skip]
| * | | Fix third-party system libraries list in ActiveStorage::Preview [ci skip]Yoshiyuki Hirano2017-10-041-2/+2
|/ / /
* | | Associate blobs with their attachmentsGeorge Claghorn2017-10-031-0/+2
| | |
* | | Merge pull request #30786 from y-yagi/add_test_case_for_font_urlRyuta Kamizono2017-10-031-0/+26
|\ \ \ | | | | | | | | Add test case for `font_url`
| * | | Add test case for `font_url`yuuji.yaginuma2017-10-031-0/+26
| | | | | | | | | | | | | | | | Since test of `font_url` was not in Action View's test suite, so it added.
* | | | Merge pull request #30781 from mcmire/patch-1Guillermo Iguaran2017-10-021-23/+18
|\ \ \ \ | | | | | | | | | | rails-ujs: Update README
| * | | | rails-ujs: Update READMEElliot Winkler2017-10-021-23/+18
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make various wording tweaks to cater to users who are viewing the README on NPM. Notably, don't highlight Yarn specifically in the installation instructions -- even though this is the preferred tool of choice especially in the Ruby community, some people still use NPM (and, really, ES2015+ syntax has nothing to do with NPM or Yarn).
* | | | Merge pull request #30774 from atd/masterRyuta Kamizono2017-10-021-1/+1
|\ \ \ \ | | | | | | | | | | Add link to Rack website [ci skip]
| * | | | Add link to Rack websiteAntonio Tapiador del Dujo2017-10-021-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Resemble links to Bundler and Yarn, based on feedback by @kamipo [ci skip]
* | | | Make internal methods in `AbstractController::Rendering` to privateRyuta Kamizono2017-10-021-0/+1
| | | |
* | | | Merge pull request #30763 from y-yagi/remove_unused_methodRyuta Kamizono2017-10-011-8/+0
|\ \ \ \ | |/ / / |/| | | Remove unused `new_credentials_configuration`
| * | | Remove unused `new_credentials_configuration`yuuji.yaginuma2017-10-011-8/+0
|/ / / | | | | | | | | | `new_credentials_configuration` is no longer used since 081a6ac6f7fd929798481f9ee333fb92b441356c.
* | | Merge pull request #30761 from patrickdavey/fix_broken_link_in_security_guideRyuta Kamizono2017-10-011-1/+1
|\ \ \ | | | | | | | | Fix broken link to recaptcha.net [ci skip]
| * | | Fix broken link to recaptcha.net [ci skip]Patrick Davey2017-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | The link to recaptcha.net returns a 404. As far as I can tell, the new link ought to be to https://developers.google.com/recaptcha/ .
* | | | Ensure `AliasTracker` respects a custom table nameRyuta Kamizono2017-09-303-6/+10
| | | |