aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #32874 from tylerhunt/remove_render_text_docsEileen M. Uchitelle2018-05-111-1/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove reference to old `:text` rendering option
| * | | | | | | | | Remove reference to old `:text` rendering optionTyler Hunt2018-05-111-1/+0
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | `becomes` should clear the mutation tracker which is created in ↵Ryuta Kamizono2018-05-114-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `after_initialize` `becomes` creates new object and copies attributes from the receiver. If new object has mutation tracker which is created in `after_initialize`, it should be cleared since it is for discarded attributes. But if the receiver doesn't have mutation tracker yet, it will not be cleared properly. It should be cleared regardless of whether the receiver has mutation tracker or not. Fixes #32867.
* | | | | | | | | Merge pull request #32849 from anthonycrumley/oxford-commasMatthew Draper2018-05-1134-115/+115
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Added a lot of Oxford commas
| * | | | | | | | | Added a lot of Oxford commasAnthony Crumley2018-05-1034-115/+115
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] A regular expression was used to find a lot of missing Oxford commas and add them. The regular expression was as follows. ", ([a-zA-Z0-9.\`:'\"]+ ){1,6}(or|and) "
* | | | | | | | | Merge pull request #32859 from ↵George Claghorn2018-05-091-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | assain/fix-typo-activesupport-instrumentation-guide Fix Typo In ActiveSupport Instrumentation Guide
| * | | | | | | | [ci skip] fix typo in active_support_instrumentation.md guideAssain2018-05-101-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #32835 from trezona-lecomte/ar_dirty_doc_fixClaudio B2018-05-081-20/+58
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Fix ActiveRecord::AttributeMethods::Dirty documentation
| * | | | | | | Fix ActiveRecord::AttributeMethods::Dirty documentation [ci skip]Kieran Trezona-le Comte2018-05-071-20/+58
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the documentation for the newly introduced (in 5.1) AR::Dirty methods was misleading, as it stated the the new methods were aliases for the old methods. This was false, and caused confusion when the differences in their implementation became apparent. This change attempts to describe the behaviour of these methods more accurately, also noting when they are likely to be useful (i.e. before or after saving a record). This change also makes minor updates to consistently format the documentation of this API, in accordance with the API Documentation Guidelines.
* | | | | | | Merge pull request #32833 from ryandav/activestorage_blob_set_content_typeGeorge Claghorn2018-05-085-9/+49
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Add option to ActiveStorage::Blob to set extract_content_type_from_io
| * | | | | | Add option to ActiveStorage::Blob to set extract_content_type_from_ioRyan Davidson2018-05-085-9/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a boolean argument called identify to ActiveStorage::Blob methods #create_after_upload, #build_after_upload and #upload. It allows a user to bypass the automatic content_type inference from the io.
* | | | | | | Fix named route parameter example [ci skip]yuuji.yaginuma2018-05-081-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The prefix of `new` and `edit` generated by `resources` is singular.
* | | | | | | Merge pull request #32842 from tjschuck/remove_extra_requiresRyuta Kamizono2018-05-081-2/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove leftover requires
| * | | | | | | Remove leftover requiresT.J. Schuck2018-05-071-2/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Concurrent::Map usage was removed from this file in 3239ed48d28f3c0baf4445e6c279107e892b7cab * Monitor usage was removed in f233598d2da773c2024cbe62a199ddc70d9fd7a1
* | | | | | | Merge pull request #32840 from rakio1234/patch-1Vipul A M2018-05-071-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Fix output in routing.md [ci skip]
| * | | | | | Fix output in routing.md [ci skip]Yuta Uchida2018-05-071-1/+1
|/ / / / / /
* | | | | | Skip `bootsnap` contents in `app:update` task if `bootsnap` is not usedyuuji.yaginuma2018-05-072-0/+14
| | | | | |
* | | | | | Remove `test_match_p` since Rails 6 requires Ruby 2.4.1 or newerRyuta Kamizono2018-05-071-24/+0
|/ / / / / | | | | | | | | | | | | | | | Follow up of #32034.
* | | | | restores original intention in constants guide, reworded [ci skip]Xavier Noria2018-05-061-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once all technicalities have been introduced, the purpose of this paragraph is to precisely unroll expressions like "the String class". That way, the reader is forced to clearly separate concepts that Ruby programmers often have kind of blurred: * Constants are storage, like variables. * Ruby does not have syntax for class or module names. * `String` is a regular constant that holds a value. In this case, the value happens to be a class object. * Constants are stored in class and module objects. In the case of `String`, the holder is the class object stored in the `Object` constant. Understanding that paragraph the way is written is important to accomplish this objective. References #32818.
* | | | | Merge pull request #32827 from sagarkt/guides_active_record_postgresqlVipul A M2018-05-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Active Record postgresql documentation for bit string types corrected [ci skip]
| * | | | | Active Record postgresql documentation for bit string types correctedSagar Kamble2018-05-061-1/+1
|/ / / / /
* | | | | Address CI failure due to non-deterministic query resultRyuta Kamizono2018-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | https://travis-ci.org/rails/rails/jobs/375326992#L1160-L1166
* | | | | prefer File.write for bulk writesXavier Noria2018-05-053-5/+5
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I saw these ones while working on #32362. File.write was introduced in Ruby 1.9.3 and it is the most concise way to perform bulk writes (as File.read is for bulk reading). The existing flags enabled binmode, but we are dumping text here. The portable way to dump text is text mode. The only difference is newlines, and portable code should in particular emit portable newlines. Please note the hard-coded \ns are still correct. In languages with C semantics for newlines like Ruby, Python, Perl, and others, "\n" is a portable newline. Both when writing and when reading. On Windows, the I/O layer is responsible for prepending a CR before each LF on writing, and removing CRs followed by LFs on reading. On Unix, binmode is a no-op.
* | | | Merge pull request #32780 from ttanimichi/tmpYuji Yaginuma2018-05-054-1/+22
|\ \ \ \ | | | | | | | | | | Don't generate assets' initializer in `app:update` task if sprockets is skipped
| * | | | Don't generate assets' initializer in `app:update` task if sprockets is skippedTsukuru Tanimichi2018-05-054-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Execute `rails new myapp -S` and then upgrade the app by using the `app:update` task, `bin/rails c` results in `NoMethodError`. ``` $ bin/rails app:update $ bin/rails c Traceback (most recent call last): 44: from bin/rails:4:in `<main>' (snip) 1: from /Users/tanimichi.tsukuru/ghq/github.com/moneyforward/moneyplus/config/initializers/assets.rb:4:in `<top (required)>' /Users/tanimichi.tsukuru/ghq/github.com/moneyforward/moneyplus/vendor/bundle/ruby/2.5.0/gems/railties-5.2.0/lib/rails/railtie/configuration.rb:97:in `method_missing': undefined method `assets' for #<Rails::Application::Configuration:0x00007fcb8d3697e0> (NoMethodError) Did you mean? asset_host ```
* | | | | Merge pull request #32807 from bdurand/fix_committed_disable_callbacksRyuta Kamizono2018-05-053-1/+25
|\ \ \ \ \ | | | | | | | | | | | | Fix logic on disabling afer_commit callbacks
| * | | | | Fix logic on disabling commit callbacksBrian Durand2018-05-043-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | Commit callbacks are intentionally disabled when errors occur when calling the callback chain in order to reset the internal record state. However, the implicit order of operations on the logic for checking if callbacks are disabled is wrong. The result is that callbacks can be unexpectedly when errors occur in transactions.
* | | | | | Merge pull request #32809 from gmcgibbon/fix_load_error_is_missing_nil_pathEileen M. Uchitelle2018-05-042-1/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix #29632 - nil #path leads to NoMethodError in LoadError#is_missing?
| * | | | | | Fix #29632 - nil #path leads to NoMethodError in LoadError#is_missing?Neil Souza2018-05-042-1/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #29632 for details. In short, it's possible to enter `LoadError#is_missing?` when `LoadError#path` returns `nil`, leading to `path.sub` throwing an none-to-helpful `NoMethodError`. This tiniest of patch inserts `#to_s` before the `sub` call to make sure it succeeds. Affected surface area should be just as tiny since something has already gone wrong to get us into `#is_missing?` and the current behavior when `#path` returns `nil` seems clearly not intended. [Gannon McGibbon + Neil Souza]
* | | | | | Merge pull request #32818 from mechanicles/remove-sentence-confusionEileen M. Uchitelle2018-05-041-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove confusion in the sentence [ci skip]
| * | | | | | Remove confusion in the sentence [ci skip]Santosh Wadghule2018-05-041-3/+3
| | | | | | |
* | | | | | | Merge pull request #29955 from padi/update_actiondispatch_integration_docsRyuta Kamizono2018-05-041-0/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Updates documentation on ActionDispatch::Integration::Session#process [ci skip]
| * | | | | | Updates (rdoc) documentation on ActionDispatch::Integration::Session#processMarc Rendl Ignacio2017-07-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds missing information on 2 parameters: +xhr+ and +as+ [ci skip]
* | | | | | | Merge pull request #32802 from tylerhunt/active_storage_guide_editsGeorge Claghorn2018-05-031-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Minor edits to the Active Storage guide
| * | | | | | | Minor edits to the Active Storage guideTyler Hunt2018-05-031-5/+5
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spelling, grammar, and formatting. [ci skip]
* | | | | | | Assert correct response bodyGeorge Claghorn2018-05-031-4/+6
| | | | | | |
* | | | | | | Merge pull request #32799 from printercu/patch-6Ryuta Kamizono2018-05-031-11/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use usual method definition instead of extracting args from array
| * | | | | | | Use usual method definition instead of extracting args from arrayprintercu2018-05-031-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follows #32612
* | | | | | | | Partly revert "Use https with weblog URI" [ci skip]Ryuta Kamizono2018-05-031-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | weblog.jamisbuck.org is not GitHub Pages.
* | / / / / / Add support for prefetch-src directiveyuuji.yaginuma2018-05-032-0/+7
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specification: https://w3c.github.io/webappsec-csp/#directive-prefetch-src This directive can already be used as an experimental feature in Chrome. Ref: https://bugs.chromium.org/p/chromium/issues/detail?id=801561
* | | | | | Stream blobs from diskGeorge Claghorn2018-05-021-2/+13
| | | | | |
* | | | | | Merge pull request #32793 from yhirano55/use_https_with_weblog_uriArun Agrawal2018-05-028-13/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use https with weblog URI
| * | | | | | Use https with weblog URIYoshiyuki Hirano2018-05-028-13/+13
|/ / / / / /
* | | | | | Merge pull request #32787 from yahonda/remove_assert_likeRafael França2018-05-011-5/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unused `assert_like` from `Arel::Test`
| * | | | | | Remove unused `assert_like` from `Arel::Test`Yasuo Honda2018-05-021-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It had been added at https://github.com/rails/arel/commit/05b5bb12270b32e094c1c879273e0978dabe5b3b and removed at https://github.com/rails/arel/commit/db1bb4e9a728a437d16f8bdb48c3b772c3e4edb0
* | | | | | | Support streaming downloads from Google Cloud StorageGeorge Claghorn2018-05-015-31/+50
|/ / / / / /
* | | | | | Remove unnecessary requireyuuji.yaginuma2018-05-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | `require 'rubygems'` is already required in Ruby 1.9 or later.
* | | | | | Merge pull request #32784 from jpawlyn/allow-belongs-to-create-for-new-recordRyuta Kamizono2018-05-023-4/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow a belonging to object to be created from a new record
| * | | | | | Allow a belonging to object to be created from a new recordJolyon Pawlyn2018-05-013-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If a 'has one' object is created from a new record, an ActiveRecord::RecordNotSaved error is raised but this behavior was also applied to the reverse scenario.
* | | | | | | More exercise `test_remove_named_index`Ryuta Kamizono2018-05-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that do not accidentally remove an index of different definitions.