aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #33401 from pinewong/patch-1Rafael França2018-07-201-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix problem with document expiration in ActionController::HttpAuthentication::Basic
| * | | | | | Fix basic auth problem in ActionController::HttpAuthentication::Basic doc黄松2018-07-201-2/+2
|/ / / / / /
* | | | | | Merge pull request #33394 from kamipo/avoid_extra_scopingEileen M. Uchitelle2018-07-193-2/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Avoid extra scoping in delegating to klass methods in the `scope` block
| * | | | | | Avoid extra scoping in delegating to klass methods in the `scope` blockRyuta Kamizono2018-07-193-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #29301, delegating to klass methods in the `scope` block would cause extra scoping by the receiver itself. The extra scoping would always override intermediate scoping like `unscoped` and caused the regression #33387. To keep the original scoping behavior, should avoid the extra scoping in the `scope` block. Fixes #33387.
* | | | | | | Merge pull request #33391 from utilum/method_call_assertions_instead_of_mochaRyuta Kamizono2018-07-195-98/+154
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Use MethodCallAssertions instead of Mocha#expects
| * | | | | | Use MethodCallAssertions instead of Mocha#expectsutilum2018-07-195-98/+154
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many calls to `Mocha#expects` preceded the introduction of `ActiveSupport::Testing::MethodCallAssertions` in 53f64c0fb, and many are simple to replace with `MethodCallAssertions`. This patch makes all these simple replacements. Step 5 in #33162
* | | | | | Fix `insert_fixtures_set` to be restored original connection flagsRyuta Kamizono2018-07-193-34/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #33363 has two regressions. First one is that `insert_fixtures_set` is failed if flags is an array. Second one is that connection flags are not restored if `set_server_option` is not supported.
* | | | | | Link between ActiveStorage::Blob#purge, #purge_later, and #delete [ci skip]George Claghorn2018-07-181-5/+5
| | | | | |
* | | | | | Clarify the ActiveStorage::Attachment#purge and #purge_later docsGeorge Claghorn2018-07-181-2/+2
|/ / / / / | | | | | | | | | | | | | | | Link to the corresponding ActiveStorage::Blob methods, whose docs more accurately describe their effects. [ci skip]
* | | | | Revert "Short circuit the scoping delegation for `relation.all`"Ryuta Kamizono2018-07-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit eb807384c81a6e086b17a576755e992e6c4c685e. If the current scope is affected by the `unscoped` block, `all` won't be the same with `spawn`.
* | | | | Merge pull request #33384 from ↵Rafael França2018-07-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | lanzhiheng/add-situation-for-belongs-to-associations-note [ci skip] Add situation for belongs to association.
| * | | | | Add situation for belongs to association. [ci skip]lanzhiheng2018-07-181-1/+1
| | | | | |
* | | | | | Merge pull request #33363 from ahorek/transaction_bugRafael França2018-07-182-5/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | use set_server_option if possible
| * | | | | | use set_server_option if possiblepavel2018-07-152-5/+38
| | | | | | |
* | | | | | | Revert "Merge pull request #33385 from ↵Rafael Mendonça França2018-07-181-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lanzhiheng/add-example-for-has-and-belongs-to-many-association" This reverts commit 3c8c410012e34709f3fdfe5b6a571353b20d0c56, reversing changes made to daee94da99605d89854660b63d98e4c1dc9a979d. We have this information below in the reference section for has_and_belongs_to_many.
* | | | | | | Merge pull request #31320 from gtqnchev/to_form_params-fixRafael França2018-07-183-3/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix issue with `button_to`'s `to_form_params`
| * | | | | | | Fix issue with `button_to`'s `to_form_params`Georgi Georgiev2018-07-163-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `button_to` was throwing exception when invoked with `params` hash that contains symbol and string keys. The reason for the exception was that `to_form_params` was comparing the given symbol and string keys. The issue is fixed by turning all keys to strings inside `to_form_params` before comparing them.
* | | | | | | | Merge pull request #33385 from ↵Rafael França2018-07-181-0/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lanzhiheng/add-example-for-has-and-belongs-to-many-association [ci skip] Add example for `has-and-belongs-to-many` association.
| * | | | | | | | Add example for `has-and-belongs-to-many` association. [ci skip]lanzhiheng2018-07-181-0/+16
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #33358 from azbshiri/summer-timeRafael França2018-07-182-2/+25
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Normalize the date component to 2000-01-01 automatically
| * | | | | | | Test DST both in local and utc timezoneAlireza Bashiri2018-07-171-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also? Updated failing test.
| * | | | | | | Implement change() to convert to "2001-01-01" firstSean Prashad2018-07-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit da34d4766c33a042aeb92778a492fa810ec23001)
* | | | | | | | Merge pull request #33375 from utilum/stub_leftoverRafael França2018-07-173-26/+46
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Remove/Replace some more calls to Mocha#stubs
| * | | | | | | Replace some more Mocha#stub calls with Minitestutilum2018-07-173-25/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missed these in preparing #33337
| * | | | | | | Remove unnecessary Mocha stubutilum2018-07-171-1/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Should have been removed in #33309.
* | | | | | | Remove unnecessary tapGeorge Claghorn2018-07-171-10/+8
| | | | | | |
* | | | | | | Fix replacing many attachments via assign and attachGeorge Claghorn2018-07-172-0/+40
|/ / / / / /
* | | | | | Correct test nameGeorge Claghorn2018-07-161-1/+1
| | | | | |
* | | | | | Fix that successive ActiveStorage::Attached::Many#attach calls would ↵George Claghorn2018-07-162-27/+22
| | | | | | | | | | | | | | | | | | | | | | | | overwrite previous attachments
* | | | | | Test removing attachments via #attachGeorge Claghorn2018-07-162-12/+59
| | | | | |
* | | | | | Merge pull request #33370 from bogdanvlviv/follow-up-33337Ryuta Kamizono2018-07-163-15/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Clarify test cases
| * | | | | Clarify test casesbogdanvlviv2018-07-153-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove extra stub of `ActiveRecord::Base::connection` in `activerecord/test/cases/tasks/mysql_rake_test.rb`. Remove extra stub of `File::exist?` in `activerecord/test/cases/tasks/sqlite_rake_test.rb`. `ActiveRecord::Base::establish_connection` shouldn't return `true` in test cases. Related to https://github.com/rails/rails/pull/33337.
* | | | | | Merge pull request #33364 from lanzhiheng/fix-document-in-model-validatorRyuta Kamizono2018-07-161-18/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Modify the expression's issue for `errors.add` document. [ci skip]
| * | | | | Remove the invalid usage document about `errors`. [ci skip]lanzhiheng2018-07-161-18/+0
| | | | | |
* | | | | | Restore inadvertently-removed fallbackGeorge Claghorn2018-07-152-1/+8
| | | | | |
* | | | | | Support HTTP Range downloads from diskGeorge Claghorn2018-07-153-20/+30
| | | | | | | | | | | | | | | | | | | | | | | | Closes #32193.
* | | | | | Merge pull request #33337 from utilum/stub_with_minitest_not_mochaRyuta Kamizono2018-07-166-461/+699
|\ \ \ \ \ \ | | |/ / / / | |/| | | | Stub with minitest not mocha
| * | | | | Stub with Minitest instead of Mochautilum2018-07-156-461/+699
| | |/ / / | |/| | | | | | | | | | | | | Step 4 in #33162
* | | | | Merge pull request #33366 from ahorek/fix_selectorRyuta Kamizono2018-07-161-1/+7
|\ \ \ \ \ | | | | | | | | | | | | fix test_should_impose_childless_html_tags_in_html failure with JRuby
| * | | | | test_should_impose_childless_html_tags_in_html failure with JRubypavel2018-07-151-1/+7
| |/ / / /
* | | | | Merge pull request #33365 from ↵Ryuta Kamizono2018-07-161-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | lanzhiheng/fix-document-issue-about-active-record-callbacks-after_touch Fix document issue in active record callback about `after_touch` hook. [ci skip]
| * | | | Fix document issue in active record callback about `after_touch` hook.lanzhiheng2018-07-151-4/+4
|/ / / /
* | | | Merge pull request #33361 from jhubert/bugfix/fix-added-string-attributesEileen M. Uchitelle2018-07-142-1/+7
|\ \ \ \ | | | | | | | | | | Fix regression in use of string attribute in the added? method
| * | | | Ensure attribute is a symbol in the added? methodJeremy Baker2018-07-142-1/+7
| | | | |
* | | | | Merge pull request #33360 from ↵Eileen M. Uchitelle2018-07-141-0/+6
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | jedrekdomanski/Update-active-record-querying-readme Update documentation for #pluck method [ci skip]
| * | | | Update documentation for #pluck method [ci skip]Jędrek Domański2018-07-141-0/+6
|/ / / /
* | | | Clear attachment changes on reloadGeorge Claghorn2018-07-133-0/+20
| | | |
* | | | Implement ActiveStorage::Attached::{One,Many}#attach in terms of changesGeorge Claghorn2018-07-137-67/+183
| | | |
* | | | Fix that detaching could purgeGeorge Claghorn2018-07-134-2/+34
| | | |
* | | | Fix analyzing new blobs from uploaded files on attachGeorge Claghorn2018-07-133-18/+120
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-15 20:47:03 +0000