aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Remove `with_layout_format` delegationAaron Patterson2019-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That method doesn't exist on LookupContext, so the delegate doesn't make sense.
| * | | | | | | Cache the digest path on the stack.Aaron Patterson2019-01-281-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can remove the ivar by caching the digest on the stack
| * | | | | | | Pull `@template` in to a local variableAaron Patterson2019-01-284-27/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gets the PartialRenderer to be a bit closer to the TemplateRenderer. TemplateRenderer already keeps its template in a local variable.
| * | | | | | | Remove default parameters from method signatureAaron Patterson2019-01-281-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method is private, and we always pass something in.
| * | | | | | | Remove `@view` instance variable from the partial rendererAaron Patterson2019-01-283-27/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to 1853b0d0abf87dfdd4c3a277c3badb17ca19652e
| * | | | | | | Remove `find_template` and `find_file` delegate methodsAaron Patterson2019-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reduces the surface area of our API and removes a Liskov issue. Both TemplateRenderer and PartialRenderer inherit from AbstractRenderer, but since PartialRenderer implements it's own `find_template` that is private, and has the wrong method signature, an instance of PartialRenderer cannot be substituted for an instance of AbstractRenderer renderer. Removing the superclass implementation solves both issues.
| * | | | | | | Deprecate `with_fallbacks` using a blockAaron Patterson2019-01-283-15/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes `with_fallbacks` to be a factory method that returns a new instance of a lookup context which contains the fallback view paths in addition to the controller specific view paths. Since the lookup context is more "read only", we may be able to cache them
* | | | | | | | Revert "Apply `t.timestamps` changes in Action Text and Action Mailbox"Ryuta Kamizono2019-01-294-2/+7
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | This reverts commit 30f666f87ab873258b797b39f29cf852f7621bea.
* | | | | | | Merge pull request #35074 from rails/ro-lookup-contextAaron Patterson2019-01-283-25/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make the lookup context more "read-only"
| * | | | | | | Make `@view_paths` on the lookup context mostly read-onlyAaron Patterson2019-01-282-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `with_fallbacks` method will temporarily mutate the lookup context instance, but nobody can call the setter, and we don't have to do a push / pop dance.
| * | | | | | | Remove method named "hash"Aaron Patterson2019-01-282-8/+10
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't use the FixtureResolver as a hash key because it doesn't implement `hash` correctly. This commit renames the method to "data" (which is just as unfortunately named :( )
* | | | | | | Merge pull request #35062 from larskanis/native-timestampsAaron Patterson2019-01-282-3/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | PostgreSQL: Use native timestamp decoders of pg-1.1
| * | | | | | | PostgreSQL: Use native timestamp decoders of pg-1.1Lars Kanis2019-01-262-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves performance of timestamp conversion and avoids additional string allocations.
* | | | | | | | Apply `t.timestamps` changes in Action Text and Action MailboxRyuta Kamizono2019-01-294-7/+2
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Follow up #34956.
* | | | | | | Merge pull request #35030 from ↵Rafael França2019-01-282-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alkesh26/actionpack-long-string-indentation-and-typo-fix Actionpack typo fixes.
| * | | | | | | Typo fixes action pack.alkesh262019-01-262-2/+2
| | | | | | | |
* | | | | | | | Add CHANGELOG entries for npm package renames [ci skip]Javan Makhmali2019-01-283-0/+18
| |_|/ / / / / |/| | | | | |
* | | | | | | Convert path to string before call `length`yuuji.yaginuma2019-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because eager load paths support to using `Pathname`, and `Pathname` doesn't have `length` method. Ref: https://travis-ci.org/rails/rails/jobs/485088071#L5140-L5143 Follow up aadeed1518b9092ea21adf49c728172368129f0e.
* | | | | | | Simplify path prefix extractionXavier Noria2019-01-271-2/+3
| |/ / / / / |/| | | | |
* | | | | | Fix a tiny typo [ci skip]Robin Dupret2019-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Follow-up to #35055.
* | | | | | Merge pull request #34970 from kamipo/timestamps_with_precision_by_defaultRyuta Kamizono2019-01-2614-75/+206
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make `t.timestamps` with precision by default.
| * | | | | | Make `t.timestamps` with precision by defaultRyuta Kamizono2019-01-2614-75/+206
| | | | | | |
* | | | | | | Merge pull request #35057 from javan/actiontext/blob-embeds-onlyJavan Makhmali2019-01-262-1/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix error saving Action Text content containing non-blob attachables
| * | | | | | Fix error saving Action Text content containing non-blob attachablesJavan Makhmali2019-01-252-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Failing test before the ActionText::RichText change: ``` Error: ActionText::ModelTest#test_embed_extraction_only_extracts_file_attachments: ArgumentError: Could not find or build blob: expected attachable, got #<ActionText::Attachables::RemoteImage:0x00007fb0259fef70 @url="http://example.com/cat.jpg", @content_type="image", @width=nil, @height=nil> ```
* | | | | | | Fix `t.timestamps` missing `null: false` in `change_table bulk: true`Ryuta Kamizono2019-01-264-0/+36
| | | | | | |
* | | | | | | Allow `column_exists?` giving options without typeRyuta Kamizono2019-01-263-13/+13
| | | | | | |
* | | | | | | Fix typo: overriden -> overridden [ci skip] (#35060)Vipul A M2019-01-261-1/+1
| | | | | | |
* | | | | | | Merge pull request #35055 from bughit/patch-1Rafael França2019-01-261-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | document the possibility of app initializers running before gem initializers
| * | | | | | | document the possibility of app initializers running before gem initilizersbughit2019-01-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | and suggest a workaround
* | | | | | | | Merge pull request #34803 from yahonda/use_xenialYuji Yaginuma2019-01-261-85/+32
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use Ubuntu Xenial (16.04) at Travis CI
| * | | | | | | | Use Ubuntu Xenial (16.04) at Travis CIYasuo Honda2019-01-261-85/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://docs.travis-ci.com/user/reference/xenial/ * MySQL 5.7 and PostgreSQL 10 is available by default https://docs.travis-ci.com/user/reference/xenial/#databases-and-services * No matrixes necessary for "GEM=activerecord:mysql2", "GEM=activerecord:postgresql", "GEM=railties" and "GEM=actionmailer,activemodel,activesupport,actionview,activejob,activestorage,actionmailbox,actiontext" * Run mysql_upgrade for MariaDB * Increase ramfs size before install for "GEM=activerecord:postgresql" * Use FFMpeg 3.x using ppa:jonathonf/ffmpeg-3 Ubuntu 16.04 installs FFMpeg version 2.x by default, which does not pass two of Active Stroage tests reported at https://github.com/rails/rails/issues/34921 * Use `rabbitmq-server` package and service * Update bundler and rubygems to address "Could not find 'bundler' (1.17.2)" for ruby-head ``` $ bundle install --jobs 3 --retry 3 Traceback (most recent call last): 2: from /home/travis/.rvm/rubies/ruby-head/bin/bundle:30:in `<main>' 1: from /home/travis/.rvm/rubies/ruby-head/lib/ruby/2.7.0/rubygems.rb:302:in `activate_bin_path' /home/travis/.rvm/rubies/ruby-head/lib/ruby/2.7.0/rubygems.rb:283:in `find_spec_for_exe': Could not find 'bundler' (1.17.2) required by your /home/travis/build/rails/rails/Gemfile.lock. (Gem::GemNotFoundException) To update to the latest version installed on your system, run `bundle update --bundler`.\nTo install the missing version, run `gem install bundler:1.17.2`\n ``` * Use oraclejdk11 (18.9 LTS) to address the following error ``` $ ~/bin/install-jdk.sh --target "/home/travis/oraclejdk8" --workspace "/home/travis/.cache/install-jdk" --feature "8" --license "BCL" install-jdk.sh 2018-10-17 Expected feature release number in range of 9 to 13, but got: 8 ``` Refer: https://docs.travis-ci.com/user/reference/xenial/#jvm-clojure-groovy-java-scala-support
* | | | | | | | | Add missing require for `Float#to_d`yuuji.yaginuma2019-01-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In master, tests pass because `bigdecimal/util` requires in `active_support/xml_mini`. But test fails in 5-2-stable because that require does not exist. Ref: https://travis-ci.org/rails/rails/jobs/484627996#L1969
* | | | | | | | | Merge pull request #35054 from bogdanvlviv/exercise-redirect_backRyuta Kamizono2019-01-261-0/+29
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Ensure that `redirect_back` with `fallback_location` to another host is allowed
| * | | | | | | | | Ensure that `redirect_back` with `fallback_location` to another host is allowedbogdanvlviv2019-01-251-0/+29
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | I would like to add those tests to prevent regression.
* | | | | | | | | Loosen check of error cause fileyuuji.yaginuma2019-01-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since "actionpack" is not included in isolation test. Ref: https://travis-ci.org/rails/rails/jobs/484514392#L2715
* | | | | | | | | Merge pull request #35056 from larskanis/origin-queue-classicRyuta Kamizono2019-01-262-9/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Switch queue_classic back to origin repository
| * | | | | | | | Switch queue_classic back to origin repositoryLars Kanis2019-01-252-9/+8
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been moved to the a fork as part of https://github.com/rails/rails/pull/31671 . That was since to that time a required PR was not yet merged. Now the queue_classic master branch is compatible to recent pg versions, so that there's no need to keep using a fork.
* | | | | | | | Merge pull request #35049 from yuki24/fix-33414Aaron Patterson2019-01-253-13/+34
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fixed a bug where the debug view does not show the error page properly
| * | | | | | | Fixed a bug where the debug view does not show the error page properlyYuki Nishijima2019-01-243-13/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two cases where the debug view does not show the error details properly: * When the cause is mapped to an HTTP status code the last exception is unexpectedly uwrapped * When the last error is thrown from a view template the debug view is not using the `rescues/template_error.html.erb` to generate the view Both the cases could be fixed by not unwrapping the exception. The only case where the exception should be unwrapped is when the last error is an `ActionView::Template::Error` object. In this case the HTTP status code is determined based on the cause. There are actually more wrapper exceptions that are intentionally thrown. However, there is a consistent pattern of setting the original message and original backtrace to the wrapper exception implemented, so the debug view will not lose the information about what went wrong eariler.
* | | | | | | | Merge pull request #35042 from eileencodes/fix-error-message-for-missing-handlerEileen M. Uchitelle2019-01-254-8/+21
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Fix error raised when handler doesn't exist
| * | | | | | | Fix error raised when handler doesn't existEileen Uchitelle2019-01-254-8/+21
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While working on another feature for multiple databases (auto-switching) I observed that in development the first request won't autoload the application record connection for the primary database and may not yet know about the replica connection. In my test application this caused the application to thrown an error if I tried to send the first request to the replica before the replica was connected. This wouldn't be an issue in production because the application is preloaded. In order to fix this I decided to leave the original error message and delete the new error message. I updated the original error message to include the `role` to make it a bit clearer that the connection isn't established for that particular role. The error now reads: ``` No connection pool with 'primary' found for the 'reading' role. ``` A single database application will continue uisng the original error message: ``` No connection pool with 'primary' found. ```
* | | | | | | Merge pull request #35050 from ricardotk002/fix-typo-rails-testing-guidesGuillermo Iguaran2019-01-241-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Fix typo in ActionCable::Connection::TestCase reference [ci-skip]
| * | | | | | Fix typo in ActionCable::Connection::TestCase referenceRicardo Diaz2019-01-241-1/+1
|/ / / / / /
* | | | | | Merge pull request #34789 from christos/fix-editing-new-environment-credentialsKasper Timm Hansen2019-01-253-2/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't load app environment when editing credentials
| * | | | | | Don't load app environment when editing credentialsChristos Zisopoulos2018-12-263-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids missing key exceptions caused by code that tries to read the credentials before they have been added to the encrypted file, for example when editing the credentials for a new environment.
* | | | | | | Merge pull request #34994 from schuetzm/host-authorization-only-in-developmentRafael França2019-01-242-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Recommend adding the requested domain to hosts whitelist only in deve…
| * | | | | | | Recommend adding the requested domain to hosts whitelist only in developmentMarc Schütz2019-01-232-4/+4
| | | | | | | |
* | | | | | | | Merge pull request #35021 from palkan/refactor/broadcasting-for-testingKasper Timm Hansen2019-01-247-21/+84
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Action Cable: move channel_name to Channel.broadcasting_for
| * | | | | | | | fix fixture syntax in cable docs and guidesVladimir Dementyev2019-01-222-6/+6
| | | | | | | | |
| * | | | | | | | Add note about broadcast_to/broadcasting_for to change logVladimir Dementyev2019-01-222-1/+25
| | | | | | | | |