aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Improve test case to test enum correctlyRich2018-08-201-0/+3
| | | | | | without define the enum in class “SpecialBook”, any string status will be casted to integer 0. Then the test have no meaning. [Rich Chen]
* Merge pull request #33655 from bogdanvlviv/follow-up-33653Ryuta Kamizono2018-08-201-16/+0
|\ | | | | DRY in Active Record Query Interface [ci skip]
| * DRY in Active Record Query Interface [ci skip]bogdanvlviv2018-08-191-16/+0
|/ | | | | | | | | | | The sentence "This is exactly the same as defining a class method ..." is not true, so #33653 fixed it, but added changes repeat what is explained a few lines below. We can remove this part since a user is able to get info about the difference between scopes and class methods below. Context https://github.com/rails/rails/pull/33653#discussion_r211105969. Reverts #33653, 97feb4996b1c88f770101dfce6d4d3a6baf6bb33.
* Fix syntax error in the doc [ci skip]Ryuta Kamizono2018-08-191-1/+1
|
* Merge pull request #33653 from LemonAndroid/patch-1Richard Schneeman2018-08-191-3/+9
|\ | | | | Explained difference between scope & class method
| * Explained difference between scope & class methodLemonAndroid2018-08-191-3/+9
| |
* | Update `google-cloud-storage` gem version [ci skip]yuuji.yaginuma2018-08-191-1/+1
| | | | | | | | Now requires version 1.11 or newer. Ref: bf5f41d948b6f3f27db7fdc2b70897aec991065f
* | Retry ActiveStorage::AnalyzeJobs on download integrity check failuresGeorge Claghorn2018-08-191-0/+2
| |
* | Remove superfluous testGeorge Claghorn2018-08-191-10/+0
| | | | | | | | This test no longer covers the behavior of ActiveStorage::PurgeJob. Attached blobs are ignored by ActiveStorage::Blob#purge as of 934fccd, which includes an equivalent model test.
* | Address intermittent CI failure due to non-determined sort orderRyuta Kamizono2018-08-191-1/+1
|/ | | | https://travis-ci.org/rails/rails/jobs/417783260#L1173-L1179
* Ensure `foreign_keys` assertions after alter tableRyuta Kamizono2018-08-191-1/+5
| | | | | If `foreign_keys` is fetched before alter table, it couldn't notice whether foreign keys are broken or not after alter table.
* Enable Style/ParenthesesAroundCondition copRyuta Kamizono2018-08-196-7/+10
| | | | To prevent style check in review like https://github.com/rails/rails/pull/33608#discussion_r211087605.
* Merge pull request #33413 from ↵Javan Makhmali2018-08-182-2/+22
|\ | | | | | | | | cseelus/active-storage-direct-uploads-multiple-submit-buttons Support multiple submit buttons in Active Storage forms
| * Enable multiple submit buttons for Active Storage formsChris Seelus2018-08-182-2/+22
|/
* Fix unclosed tags [ci skip]yuuji.yaginuma2018-08-182-2/+2
|
* Increment execution count before deserialize argumentsyuuji.yaginuma2018-08-183-3/+12
| | | | | | | | Currently, the execution count increments after deserializes arguments. Therefore, if an error occurs with deserialize, it retries indefinitely. In order to prevent this, the count is moved before deserialize. Fixes #33344.
* Merge pull request #33645 from arye-dov-eidelman/masterRichard Schneeman2018-08-171-1/+5
|\ | | | | [skip ci] Fix overlapping text in the guide
| * [skip ci] Fix overlapping text in the guideArye Dov Eidelman2018-08-171-1/+5
|/ | | | Fix a layout issue in the rails guides, where the navigation covers the main text, if the page is between 800 and 960 pixels wide. (issue #33406)
* Remove unused requiresyuuji.yaginuma2018-08-171-3/+0
|
* Merge pull request #33537 from ↵Ryuta Kamizono2018-08-171-0/+15
|\ | | | | | | | | | | ZASMan/update_action_mailer_docs_custom_view_paths Add note for custom mailer view paths in action mailer guide. [ci skip]
| * Add note for custom mailer view paths in action mailer guide. [ci skip]Zane2018-08-161-0/+16
| | | | | | | | | | | | | | | | | | | | Adds stuff Fixes a typo Integrates changes Adds link to append_view_path in actionmailer guide.
* | Merge pull request #33636 from wjordan/normalize_encode_params_require_hashYuji Yaginuma2018-08-171-0/+2
|\ \ | | | | | | add missing indifferent_access require for #normalize_encode_params
| * | add missing indifferent_access require for #normalize_encode_paramsWill Jordan2018-08-161-0/+2
|/ / | | | | | | Fixes #33634.
* | Merge pull request #33633 from utilum/update_image_processing_to_latest_versionRyuta Kamizono2018-08-171-4/+4
|\ \ | | | | | | Update image_processing to the latest version
| * | Update image_processing to the latest versionutilum2018-08-161-4/+4
|/ / | | | | | | | | | | Version 1.6.0 includes https://github.com/janko-m/image_processing/commit/3a958bc419854703860fae606423bca3667a4127 which saves us a warning: shadowing outer local variable - options. I see it locally, but for some reason not on the CI.
* | Merge pull request #33576 from aried3r/patch-5Richard Schneeman2018-08-161-7/+7
|\ \ | | | | | | Harmonize shell commands in dev guide [ci skip]
| * | Harmonize shell commands in dev guide [ci skip]Anton Rieder2018-08-161-7/+7
| | |
* | | Merge pull request #33585 from yahonda/diag33520Ryuta Kamizono2018-08-163-1/+26
|\ \ \ | | | | | | | | | | | | SQLite3 adapter `alter_table` method restores foreign keys
| * | | SQLite3 adapter `alter_table` method restores foreign keysYasuo Honda2018-08-113-1/+26
| | | | | | | | | | | | | | | | Related to #33520
* | | | Merge pull request #33603 from kamipo/fix_numericality_validatorRyuta Kamizono2018-08-164-2/+28
|\ \ \ \ | |_|/ / |/| | | Fix numericality validator not to be affected by custom getter
| * | | Fix numericality validator not to be affected by custom getterRyuta Kamizono2018-08-134-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since fe9547b6, numericality validator would parse raw value only when a value came from user to work type casting to a value from database. But that was caused a regression that the validator would work against getter value instead of parsed raw value, a getter is sometimes customized by people. #33550 There we never guarantees that the value before type cast was going to the used in this validation (actually here is only place that getter value might not be used), but we should not change the behavior unless there is some particular reason. The purpose of fe9547b6 is to work type casting to a value from database. We could achieve the purpose by using `read_attribute`, without using getter value. Fixes #33550.
* | | | Merge pull request #33629 from bogdanvlviv/follow-33626Ryuta Kamizono2018-08-161-0/+8
|\ \ \ \ | | | | | | | | | | Add example `perform_enqueued_jobs` without block to api docs [ci skip]
| * | | | Add example `perform_enqueued_jobs` without block to api docs [ci skip]bogdanvlviv2018-08-161-0/+8
|/ / / / | | | | | | | | | | | | Follow up #33626
* | | | Extract ActiveStorage::SetCurrentGeorge Claghorn2018-08-163-5/+23
| | | | | | | | | | | | | | | | Provide a handy concern for custom Active Storage controllers that can't inherit from ActiveStorage::BaseController.
* | | | Enable Lint/UriEscapeUnescape cop not to allow using obsolete methods in the ↵Ryuta Kamizono2018-08-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | future Follow up #33627.
* | | | Merge pull request #33627 from vbrazo/fixtures/fix-obsolete-methodsRyuta Kamizono2018-08-161-1/+1
|\ \ \ \ | | | | | | | | | | Fix obsoleted method URI.unescape in activesupport/test
| * | | | Fix obsoleted method URI.unescape in activesupport/testVitor Oliveira2018-08-151-1/+1
| | | | |
* | | | | Merge pull request #33626 from kddeisz/perform-enqueued-jobs-no-blockGuillermo Iguaran2018-08-153-8/+45
|\ \ \ \ \ | | | | | | | | | | | | Allow `perform_enqueued_jobs` to be called without a block.
| * | | | | Allow `perform_enqueued_jobs` to be called without a block.Kevin Deisz2018-08-153-8/+45
| |/ / / / | | | | | | | | | | | | | | | Performs all of the jobs that have been enqueued up to this point in the test.
* / / / / Do not show deprecate task in the task listyuuji.yaginuma2018-08-161-1/+0
|/ / / /
* | | | Merge pull request #33499 from lsylvester/caller-ignore-pathsKasper Timm Hansen2018-08-157-37/+73
|\ \ \ \ | | | | | | | | | | use BacktraceCleaner for ActiveRecord verbose logging
| * | | | Use backtrace cleaner to clean up backtrace for verbose query logsLachlan Sylvester2018-08-147-37/+73
| | | | |
* | | | | Merge pull request #33559 from anniecodes/dev-taskKasper Timm Hansen2018-08-155-17/+115
|\ \ \ \ \ | | | | | | | | | | | | Move `dev:cache` rake task to use Rails::Command
| * | | | | Have `bin:rake dev:cache` use the Dev Rails Command under the hoodAnnie-Claude Côté2018-08-132-17/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Call the Rails::Command::DevCommand in the rake task for dev:cache * Add deprecation for using `bin/rake` in favor of `bin/rails`
| * | | | | Adds Rails:Command for `dev:cache` that has the same behaviour as the rake taskAnnie-Claude Côté2018-08-132-0/+79
| | | | | |
| * | | | | Update Changelog to add deprecation to `rake dev:cache`Annie-Claude Côté2018-08-131-0/+4
| | |/ / / | |/| | |
* | | | | Merge pull request #33605 from assain/purpose-metadata-changelog-and-testsKasper Timm Hansen2018-08-152-8/+20
|\ \ \ \ \ | | | | | | | | | | | | Changelog and improved tests for purpose metadata added to cookies
| * | | | | Changelog for the new purpose metadata and improved testsAssain2018-08-132-8/+20
| |/ / / /
* | | | | Fix broken list formatting [ci skip]yuuji.yaginuma2018-08-151-4/+4
| | | | |
* | | | | Merge pull request #33620 from bogdanvlviv/fix-rubocop-offensesRyuta Kamizono2018-08-152-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix rubocop offenses