aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Handle `FrozenError` if it is availableYasuo Honda2017-12-208-5/+17
| | | | | | | | | | | | | | | This pull request handles `FrozenError` introduced by Ruby 2.5. Refer https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/61131 Since `FrozenError` is a subclass of `RuntimeError` minitest used by master branch can handle it, though it would be better to handle `FrozenError` explicitly if possible. `FrozenError` does not exist in Ruby 2.4 or lower, `frozen_error_class` handles which exception is expected to be raised. This pull request is intended to be merged to master, then backported to `5-1-stable` to address #31508
* Merge pull request #31348 from y-yagi/fix_31283Kasper Timm Hansen2017-12-1813-27/+94
|\ | | | | Raise an error only when `require_master_key` is specified
| * Raise an error only when `require_master_key` is specifiedyuuji.yaginuma2017-12-1813-27/+94
| | | | | | | | | | | | | | | | | | To prevent errors from being raise in environments where credentials is unnecessary. Context: https://github.com/rails/rails/issues/31283#issuecomment-348801489 Fixes #31283
* | Merge pull request #31497 from aried3r/patch-2Kasper Timm Hansen2017-12-181-1/+1
|\ \ | | | | | | Update new_framework_defaults_5_2.rb.tt
| * | Update new_framework_defaults_5_2.rb.ttAnton Rieder2017-12-181-1/+1
| | | | | | | | | Be consistent in comments when mentioning AES.
* | | Ensure MiniMagick tempfiles are properly unlinked after image transformationGeorge Claghorn2017-12-181-9/+18
|/ /
* | Merge pull request #31449 from PHedkvist/headless_api_docEileen M. Uchitelle2017-12-181-0/+3
|\ \ | | | | | | Add headless browser support in api docs [ci skip]
| * | Add headless browser support in api docs [ci skip]Pierre Hedkvist2017-12-181-0/+3
| | |
* | | Merge pull request #31485 from y-yagi/skip_bootsnap_optionEileen M. Uchitelle2017-12-184-0/+31
|\ \ \ | | | | | | | | Add `skip_bootsnap` option
| * | | Add `skip_bootsnap` optionyuuji.yaginuma2017-12-164-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | `bootsnap` is a useful gem normally. However, `bootsnap` is unnecessary when generating a Rails application to be used only for testing. So I want to control whether use this or not by option.
* | | | Merge pull request #31479 from iamvery/reword-delegate-allow-nil-paragraphEileen M. Uchitelle2017-12-181-5/+2
|\ \ \ \ | | | | | | | | | | Clarify docs for delegate :allow_nil option
| * | | | Clarify docs for delegate :allow_nil optionJay Hayes2017-12-151-5/+2
| | | | |
* | | | | Merge pull request #31490 from eugeneius/hash_digest_class_truncateEileen M. Uchitelle2017-12-184-15/+7
|\ \ \ \ \ | | | | | | | | | | | | Don't include ellipsis in truncated digest output
| * | | | | Don't include ellipsis in truncated digest outputEugene Kenny2017-12-174-15/+7
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using `truncate` to limit the length of the digest has the unwanted side effect of adding an ellipsis when the input is longer than the limit. Also: - Don't instantiate a new object for every digest - Rename the configuration option to `hash_digest_class` - Update the CHANGELOG entry to describe how to use the feature
* | | | | Convert non-web image (e.g. PSD) variants to PNGGeorge Claghorn2017-12-183-12/+53
| |_|_|/ |/| | |
* | | | Fix `test_counter_cache_with_touch_and_lock_version` failureRyuta Kamizono2017-12-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Looks like it is failed due to datetime rounding. Related #23521. https://travis-ci.org/rails/rails/jobs/317734560#L1980-L1984
* | | | Using table name qualified column names unless having SELECT list explicitlyRyuta Kamizono2017-12-182-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | Previously table name qualified `*` is used in that case. If it is not qualified with a table name, an ambiguous column name error will occur when using JOINs.
* | | | emphasize working on existing issues/patches for newcomers [ci skip]Xavier Noria2017-12-171-1/+3
| | | | | | | | | | | | | | | | Thanks to @Datasnuten for the suggestion.
* | | | Minor cleanup of CHANGELOG of PR #30850 [ci skip]Prathamesh Sonpatki2017-12-171-3/+3
| | | |
* | | | Added reference to default value of `allow_other_host` [ci skip]Prathamesh Sonpatki2017-12-171-1/+1
| | | |
* | | | Update ActiveStorage::Blob#transformation docs [ci skip]George Claghorn2017-12-161-3/+3
| | | |
* | | | Add test case that active_storage:install task works within engineyuuji.yaginuma2017-12-171-0/+15
|/ / / | | | | | | | | | Follow up of #31391
* | | Merge pull request #31316 from bogdanvlviv/update-association_basics-guideKasper Timm Hansen2017-12-161-3/+5
|\ \ \ | | | | | | | | Update "Active Record Associations" guide [ci skip]
| * | | Update "Active Record Associations" guide [ci skip]bogdanvlviv2017-12-141-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | - Make all `ActiveRecord::Base.find` as link - Remove redundant sentences "It also adds the additional condition that the object must be in the collection."
* | | | Merge pull request #31484 from yhirano55/fix_active_storage_guideRyuta Kamizono2017-12-161-5/+5
|\ \ \ \ | | | | | | | | | | Fix Active Storage Overview guide [ci skip]
| * | | | Fix Active Storage Overview guide [ci skip]Yoshiyuki Hirano2017-12-161-5/+5
|/ / / /
* | | | Explicitly require `sidekiq/cli`yuuji.yaginuma2017-12-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, sidekiq integration test + Ruby 2.5.0-rc1 show exception as follows. ``` #<Thread:0x000000000670bec0@/home/travis/build/rails/rails/vendor/bundle/ruby/2.5.0/gems/sidekiq-5.0.5/lib/sidekiq/util.rb:23 run> terminated with exception (report_on_exception is true): /home/travis/build/rails/rails/vendor/bundle/ruby/2.5.0/gems/bootsnap-1.1.7/lib/bootsnap/load_path_cache/core_ext/active_support.rb:53:in `block in load_missing_constant': uninitialized constant Sidekiq::CLI (NameError) from /home/travis/build/rails/rails/vendor/bundle/ruby/2.5.0/gems/bootsnap-1.1.7/lib/bootsnap/load_path_cache/core_ext/active_support.rb:8:in `without_bootsnap_cache' from /home/travis/build/rails/rails/vendor/bundle/ruby/2.5.0/gems/bootsnap-1.1.7/lib/bootsnap/load_path_cache/core_ext/active_support.rb:53:in `rescue in load_missing_constant' from /home/travis/build/rails/rails/vendor/bundle/ruby/2.5.0/gems/bootsnap-1.1.7/lib/bootsnap/load_path_cache/core_ext/active_support.rb:42:in `load_missing_constant' from /home/travis/build/rails/rails/vendor/bundle/ruby/2.5.0/gems/sidekiq-5.0.5/lib/sidekiq/launcher.rb:65:in `heartbeat' from /home/travis/build/rails/rails/vendor/bundle/ruby/2.5.0/gems/sidekiq-5.0.5/lib/sidekiq/launcher.rb:123:in `start_heartbeat' ``` https://travis-ci.org/rails/rails/jobs/317187279#L2152 The reason for this is that `Sidekiq::CLI` has not been loaded. Sidekiq integration test launches a Sidekiq instance within another Ruby process. In such a case, need to require 'sidekiq/cli' in that launch code. Ref: https://github.com/mperham/sidekiq/pull/3692#issuecomment-352032251
* | | | Handle invalid signed blob IDs gracefullyGeorge Claghorn2017-12-157-18/+51
| | | |
* | | | Merge pull request #31481 from claudiob/fix-ast-guidesClaudio B2017-12-151-6/+6
|\ \ \ \ | |_|/ / |/| | | [ci skip] Use :amazon, not :s3, so that guides reflect the current code
| * | | [ci skip] Use :amazon, not :s3, to reflect codeClaudio B2017-12-151-6/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | The [template](https://github.com/rails/rails/blob/master/railties/lib/rails/generators/rails/app/templates/config/storage.yml.tt#L10) that generates the `config/storage.yml` file has the Amazon S3 key specified as `:amazon`, not `:s3`. The guides should reflect the nomenclature, given that every other service also has the name of the company as the key (:google, :microsoft).
* | | Merge pull request #31473 from shioyama/fix_instantiate_test_attributesRyuta Kamizono2017-12-161-4/+7
|\ \ \ | | | | | | | | Modify test to correctly pass attributes hash
| * | | Modify test to correctly pass attributes hashChris Salzberg2017-12-151-4/+7
| | | |
* | | | Restrict variants to variable image blobsGeorge Claghorn2017-12-154-4/+27
| | | |
* | | | Remove needless `change_table`Ryuta Kamizono2017-12-151-6/+2
| | | | | | | | | | | | | | | | | | | | These are using `remove_column` directly, not used `t` in `change_table`.
* | | | Sync header title with file name [ci skip]Ryuta Kamizono2017-12-152-3/+3
| | | | | | | | | | | | | | | | Like other Basics and Overview guides.
* | | | Merge pull request #31470 from ydakuka/fix-typos-a-st-guideRyuta Kamizono2017-12-151-5/+5
|\ \ \ \ | | | | | | | | | | Fix in ASt guide [ci skip]
| * | | | Fix in ASt guide [ci skip]Yauheni Dakuka2017-12-151-5/+5
| | | | |
* | | | | Merge pull request #31471 from yhirano55/inherit_active_record_baseRyuta Kamizono2017-12-151-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | [ci skip] Inherit ActiveRecord::Base in example codes
| * | | | [ci skip] Inherit ActiveRecord::Base in example codesYoshiyuki Hirano2017-12-151-2/+2
| | | | |
* | | | | Fix guide generation error [ci skip]yuuji.yaginuma2017-12-151-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, generation of guide is an error in `5_2_release_notes.html`. ``` $ bunele exec rake guides:generate:html Generating 5_2_release_notes.md as 5_2_release_notes.html rails/guides/rails_guides/markdown.rb:44:in `dom_id': undefined method `[]' for nil:NilClass (NoMethodError) from rails/guides/rails_guides/markdown.rb:106:in `block (2 levels) in generate_structure' ``` It seems that it is an error because there are multiple `active-storage` anchors. Since Active Storage is a Major feature, it is unnecessary to show CHANGELOGs, so remove from `Incompatibilities` section.
* | | | | [ci skip] Add missing **DO NOT READ THIS FILE ON GITHUB, GUIDES ARE ↵Ryuta Kamizono2017-12-152-1/+2
| | | | | | | | | | | | | | | | | | | | PUBLISHED ON http://guides.rubyonrails.org.**
* | | | | Merge pull request #31466 from dixitp012/action_pack_doc_link_updateRyuta Kamizono2017-12-151-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | [ci skip] update link
| * | | | [ci skip] update linkDixit Patel2017-12-151-1/+1
| | | | |
* | | | | Merge pull request #31464 from yhirano55/update_guide_indexGeorge Claghorn2017-12-141-0/+4
|\ \ \ \ \ | |/ / / / |/| | | | [ci skip] Update guide index for active storage
| * | | | [ci skip] Update guide index for active storageYoshiyuki Hirano2017-12-151-0/+4
|/ / / /
* | | | Clear dirty `schema_cache` after `dump_schema_cache`Ryuta Kamizono2017-12-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `dump_schema_cache` fills `schema_cache` even if the test that modifies the schema has properly cleared the schema cache. Fixes #31463.
* | | | Merge pull request #31037 from jeffreyguenther/activestorage-guideGeorge Claghorn2017-12-142-1/+550
|\ \ \ \ | | | | | | | | | | ActiveStorage Guide
| * | | | Tweak whitespaceJeffrey Guenther2017-12-141-0/+1
| | | | |
| * | | | Formatting updatesJeffrey Guenther2017-12-141-14/+19
| | | | |
| * | | | Merge branch 'master' into activestorage-guideJeffrey Guenther2017-12-14164-504/+1138
| |\ \ \ \ | |/ / / / |/| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 17:22:06 +0000