aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #33348 from ruralocity/update-validation-contexts-guideRyuta Kamizono2018-09-281-9/+27
|\ | | | | Update guide for validation custom contexts [ci skip]
| * Update guide for validation custom contexts [ci skip]Aaron Sumner2018-07-111-9/+27
| | | | | | | | | | | | | | | | | | | | | | The Active Record validations guide's section on custom contexts appears to be incomplete. the code sample shows a context being added to validations, but not being used. Add to the sample code for this section by showing validations being run with and without the custom context. Add a second sample code block showing that validations with no context are also run, when a context is used.
* | Merge pull request #33570 from mohitnatoo/queue_adapter_name_docRyuta Kamizono2018-09-281-0/+2
|\ \ | | | | | | | | | | | | Documentation for queue_adapter_name method in ActiveJob::QueueAdapter [ci skip]
| * | Documentation for queue_adapter_name method in ActiveJob::QueueAdapter [ci skip]Mohit Natoo2018-08-101-0/+2
| | |
* | | Merge pull request #34013 from bogdan/relation-merge-fromRyuta Kamizono2018-09-282-3/+10
|\ \ \ | | | | | | | | Bugfix ActiveRecord::Relation#merge special case of from clause
| * | | Bugfix ActiveRecord::Relation#merge special case of from clauseBogdan Gusiev2018-09-282-3/+10
|/ / / | | | | | | | | | | | | When one relation is merged into another that has a different base class merging `from_clause` causes invalid SQL to be generated
* | | Merge pull request #34010 from Edouard-chin/ec-uneeded-requireRyuta Kamizono2018-09-282-1/+1
|\ \ \ | | | | | | | | LoggerSilence doesn't require concurrent:
| * | | LoggerSilence doesn't require concurrent:Edouard CHIN2018-09-282-1/+1
|/ / / | | | | | | | | | - LoggerThreadSafeLevel does nowaday since 2518bda97cbbcb33dc9a92e70d5b01c09e64d12d
* | | Merge pull request #33880 from robbertbrak/masterRyuta Kamizono2018-09-281-1/+3
|\ \ \ | | | | | | | | | | | | | | | | Clarify transactional behavior of after_commit and after_rollback callbacks [ci skip]
| * | | Clarify transactional behavior of after_commit and after_rollback callbacksRobbert Brak2018-09-141-1/+3
| | | |
* | | | Merge pull request #33833 from duduribeiro/patch-2Gannon McGibbon2018-09-271-1/+1
|\ \ \ \ | | | | | | | | | | [ci skip] Do not recommend testing stored object in template
| * | | | [ci skip] Recommend testing information displayed over object storedKadu Ribeiro2018-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since `assigns` is not placed by default with Rails, we suggested to test if the right information was displayed instead of suggesting to test if the right object was stored in the template.
* | | | | Merge pull request #31441 from mrhead/rails-ujs-xhr-redirectsRafael França2018-09-274-2/+37
|\ \ \ \ \ | | | | | | | | | | | | Do not enable disabled elements for XHR redirects
| * | | | | Do not enable disabled elements for XHR redirectsPatrik Bóna2018-09-274-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #29473.
* | | | | | Handle more unsafe String methods (#33990)Janosch Müller2018-09-274-11/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Handle more unsafe String methods * Fix codeclimate issue * Revert stylistic change [Janosch Müller + Rafael Mendonça França]
* | | | | | Merge pull request #34007 from gmcgibbon/automatic_labelingRafael França2018-09-271-0/+46
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add probot autolabeler config
| * | | | | | Add probot autolabeler configGannon McGibbon2018-09-271-0/+46
| | | | | | |
* | | | | | | Add configuration to no-response probot pluginRafael França2018-09-271-0/+13
| | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge pull request #34002 from gmcgibbon/fix_deeply_nested_scoped_rootRafael França2018-09-272-1/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix optionally scoped root route unscoped access
| * | | | | | | Fix optionally scoped root route unscoped accessGannon McGibbon2018-09-272-1/+17
| |/ / / / / /
* | | | | | | Merge pull request #34006 from kamipo/remove_debug_codeRyuta Kamizono2018-09-281-10/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Revert "record who created the node when $DEBUG is true"
| * | | | | | | Revert "record who created the node when $DEBUG is true"Ryuta Kamizono2018-09-281-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a1b72178714fbf0033fe076b7e51f57eff152bdd.
* | | | | | | | Merge pull request #34004 from simonc/constraints-call-matches-edge-caseRafael Mendonça França2018-09-272-1/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing an edge case when using objects as constraints
| * | | | | | | | Fixing an edge case when using objects as constraintsSimon Courtois2018-09-272-1/+28
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR fixes an issue when the following situation occurs. If you define a class like this class MyConstraint def call(*args) # for some reason this is defined end def matches?(*args) # checking the args end end and try to use it as a constraint get "/", to: "home#show", constraints: MyConstraint.new if its `matches?` method returns `false` there will be an error for the mapper will ask for the constraint arity, thinking it is a proc, lambda or method. This PR checks for the presence of the `arity` method on the constraint calling it only if present, preventing the error while keeping the basic behavior.
* / / / / / / / Extract `Arel.arel_node?` helper methodRyuta Kamizono2018-09-283-4/+7
|/ / / / / / /
* | | | | | | Remove `visit_Fixnum` and `visit_Bignum`Ryuta Kamizono2018-09-281-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Ruby 2.4 unified Fixnum and Bignum into Integer.
* | | | | | | Make `update_counters` preparableRyuta Kamizono2018-09-283-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: ``` Topic Update All (0.4ms) UPDATE `topics` SET `topics`.`replies_count` = COALESCE(`topics`.`replies_count`, 0) + 1, `topics`.`updated_at` = '2018-09-27 18:34:05.068774' WHERE `topics`.`id` = ? [["id", 7]] ``` After: ``` Topic Update All (0.4ms) UPDATE `topics` SET `topics`.`replies_count` = COALESCE(`topics`.`replies_count`, 0) + ?, `topics`.`updated_at` = ? WHERE `topics`.`id` = ? [["replies_count", 1], ["updated_at", 2018-09-27 18:55:05 UTC], ["id", 7]] ```
* | | | | | | Merge pull request #33995 from Edouard-chin/ec-active-job-subset-argRafael França2018-09-273-2/+100
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add a way to check for subset of arguments when performing jobs:
| * | | | | | | Add a way to check for subset of arguments when performing jobs:Edouard CHIN2018-09-263-2/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When calling `assert_performed_with`/`assert_enqueued_with`, the +args+ needs to match exactly what the job get passed. Some jobs can have lot of arguments, or even a simple hash argument has many key. This is not convenient to test as most tests doesn't need to check if the arguments matches perfectly. This PR make it possible to only check if a subset of arguments were passed to the job.
* | | | | | | | Merge pull request #34003 from palkan/fix/cable-test-case-rails5-hackRafael França2018-09-271-6/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove Rails 5.0 workaround from ActionCable::Channel::TestCase
| * | | | | | | | Remove Rails 5.0 workaround from ActionCable::Channel::TestCaseVladimir Dementyev2018-09-271-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hack was merged from action-cable-testing gem by mistake. We don't need it in Rails 6. (cherry picked from commit 92030ec4b4309835ed0e792229984a1f0a044cef)
* | | | | | | | | Merge pull request #33986 from matt17r/patch-1Gannon McGibbon2018-09-271-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Add missing rdoc +code+ tags [ci skip]
| * | | | | | | | Add missing rdoc +code+ tagsMatthew LS2018-09-261-1/+1
| | | | | | | | |
* | | | | | | | | Make `update_all` preparableRyuta Kamizono2018-09-282-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: ``` Pet Update All (0.8ms) UPDATE `pets` LEFT OUTER JOIN `toys` ON `toys`.`pet_id` = `pets`.`pet_id` SET `pets`.`name` = 'Bob' WHERE `toys`.`name` = ? [["name", "Bone"]] ``` After: ``` Pet Update All (1.1ms) UPDATE `pets` LEFT OUTER JOIN `toys` ON `toys`.`pet_id` = `pets`.`pet_id` SET `pets`.`name` = ? WHERE `toys`.`name` = ? [["name", "Bob"], ["name", "Bone"]] ```
* | | | | | | | | Merge pull request #33979 from lzap/masterRafael França2018-09-272-0/+26
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Added ActionController::Parameters.each_value methods
| * | | | | | | | | Added ActionController::Parameters.each_value methodLukas Zapletal2018-09-272-0/+26
| | | | | | | | | |
* | | | | | | | | | Merge pull request #31604 from fatkodima/reverting-transactionEileen M. Uchitelle2018-09-277-5/+86
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix `transaction` reverting for migrations
| * | | | | | | | | | Fix `transaction` reverting for migrationsfatkodima2018-09-267-5/+86
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | [fatkodima & David Verhasselt]
* | | | | | | | | | Merge pull request #33994 from gmcgibbon/rails_g_model_migrations_pathsRafael França2018-09-274-0/+32
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | Add migrations_paths option to model generator
| * | | | | | | | | Add migrations_paths option to model generatorGannon McGibbon2018-09-274-0/+32
|/ / / / / / / / /
* | | | | | | | | Avoid extra touch queries when counter cache is updatedRyuta Kamizono2018-09-272-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since counter cache handles touch option too.
* | | | | | | | | Refactor counter cache to extract `decrement_counters_before_last_save` on ↵Ryuta Kamizono2018-09-272-48/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the belongs_to association
* | | | | | | | | Merge pull request #34001 from dark-panda/ignore-psqlrc-when-using-psqlRyuta Kamizono2018-09-272-4/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Use -X when loading structure.sql via psql
| * | | | | | | | | Use -X when loading structure.sql via psqlJ Smith2018-09-272-4/+4
|/ / / / / / / / /
* | | | | | | | | Merge pull request #33997 from MatthiasWinkelmann/pg_dumpRyuta Kamizono2018-09-272-8/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Removed invalid -X flag for pg_dump, fixes #33996
| * | | | | | | | Removed invalid -X flag for pg_dumpMatthias Winkelmann2018-09-272-8/+8
| | | | | | | | |
* | | | | | | | | Add ActionCable::Channel::TestCaseVladimir Dementyev2018-09-263-0/+464
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionCable::Channel::TestCase provides an ability to unit-test channel classes. There are several reasons to write unit/functional cable tests: - Access control (who has access to the channel? who can perform action and with which argument? - Frontend-less applications have no system tests at all–and we still need a way to test channels logic. See also #27191
* | | | | | | | Merge pull request #33970 from rails/eager-url-helpersAaron Patterson2018-09-2610-36/+102
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Eagerly build the routing helper module after routes are committed
| * | | | | | | Merge branch 'master' into eager-url-helpersAaron Patterson2018-09-2676-174/+276
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Remove force parent loading when counter cache child is created/destroyed Raise an error when loading all fixtures from nil fixture_path Revert "Remove `counter_cache_target` which is no longer called" Update counter cache in memory if parent target is existed If association is a hash-like object preloading fails Use the same option for create database statements between Raketask and travis.rb Fix "warning: shadowing outer local variable - config" Remove `counter_cache_target` which is no longer called Fix more offences Change the empty block style to have space inside of the block Fix a content_for test description Stringify database configurations Improve error message when assign wrong attributes to model
* | | | | | | | Merge pull request #30676 from artofhuman/import-assert-attrs-error-messageRafael França2018-09-262-2/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Improve error message when assign wrong attributes to model
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 17:06:59 +0000