aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge pull request #33340 from ttanimichi/patch-1Rafael França2018-07-121-1/+1
|\ \ | | | | | | [ci skip] `sanitizer_vendor` will be removed in Rails 6
| * | [ci skip] `sanitizer_vendor` will be removed in Rails 6Tsukuru Tanimichi2018-07-111-1/+1
| | | | | | | | | Related to https://github.com/rails/rails/pull/24386#issuecomment-403926683
* | | Merge pull request #33341 from Edouard-chin/ec-fix-to-paramRafael França2018-07-124-5/+35
|\ \ \ | | | | | | | | e4e1b62 broke `to_param` handling:
| * | | e4e1b62 broke `to_param` handling:Edouard CHIN2018-07-124-5/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - There was an issue inside controller tests where order params were not respected, the reason was because we were calling `Hash#to_query` which sorts the results lexicographically. 1e4e1b62 fixed that issue by not using `to_query` but instead a utility function provided by rack. - However with the fix came another issue where it's now no longer possible to do this ``` post :foo, params: { user: User.first } # Prior to the patch the controller will receive { "user" => "1" } # Whereas now you get { "user": "#<User: ...>" } ``` The fix in this PR is to modify `Hash#to_query` to sort only when it doesn't contain an array structure that looks something like "bar[]" Ref https://github.com/rails/rails/pull/33341#issuecomment-404039396
* | | | Merge pull request #33350 from kamipo/address_blank_lines_automaticallyRafael França2018-07-1217-30/+3
|\ \ \ \ | | | | | | | | | | Enable `Layout/EmptyLinesAroundBlockBody` to reduce review cost in the future
| * | | | Enable `Layout/EmptyLinesAroundBlockBody` to reduce review cost in the futureRyuta Kamizono2018-07-1217-30/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | We sometimes ask "✂️ extra blank lines" to a contributor in reviews like https://github.com/rails/rails/pull/33337#discussion_r201509738. It is preferable to deal automatically without depending on manpower.
* | | | Discard ActiveStorage::PurgeJobs for missing blobsGeorge Claghorn2018-07-112-0/+29
| | | |
* | | | Remove overly-broad retry in ActiveStorage::PurgeJobGeorge Claghorn2018-07-111-3/+0
| | | | | | | | | | | | | | | | We've never intentionally tripped this retry in production. Add retries for specific errors as needed.
* | | | Merge pull request #28327 from rngtng/add-seed-dependencyRafael França2018-07-112-1/+6
|\ \ \ \ | |/ / / |/| | | Add missing env & config dependency to `rake db:seed`
| * | | Add missing load config dependency to `rake db:seed`Tobias Bielohlawek2018-07-102-1/+6
| | | |
* | | | Merge pull request #33336 from bogdanvlviv/fix-stubbed-methods-in-test-casesRafael França2018-07-102-3/+3
|\ \ \ \ | | | | | | | | | | Fix stubbed methods in test cases
| * | | | Fix stubbed methods in test casesbogdanvlviv2018-07-102-3/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove returning of `false` value for stubbed `lock_thread=` methods since there aren't any needs in it. Remove unnecessary returning of `true` for stubbed `drop_database` method. Follow up #33309. Related to #33162, #33326.
* | | | Merge pull request #33326 from utilum/replace_shallow_mocks_with_rubyRyuta Kamizono2018-07-105-18/+47
|\ \ \ \ | | | | | | | | | | Replace shallow mocks with Ruby classes
| * | | | Replace shallow mocks with Ruby classesutilum2018-07-105-18/+47
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | While preparing this I realised that some stubbed returns values serve no purpose, so this patch drops those as well. Step 3 in #33162
* / / / Avoid unneeded expanded column aliases array cachingRyuta Kamizono2018-07-102-8/+5
|/ / /
* | | Merge pull request #33322 from utilum/test_value_instead_of_method_callRafael França2018-07-093-18/+24
|\ \ \ | | | | | | | | Reduce mocking by testing value instead of method call
| * | | Reduce mocking by testing value instead of method callutilum2018-07-093-18/+24
|/ / / | | | | | | | | | Step 2 in #33162
* | | Merge pull request #33309 from utilum/remove_unnecessary_mocha_stubsRafael França2018-07-095-48/+18
|\ \ \ | |/ / |/| | Remove unnecessary Mocha stubs
| * | Remove unnecessary Mocha stubsutilum2018-07-075-48/+18
| | | | | | | | | | | | | | | | | | Step 1 in #33162 [utilum + bogdanvlviv]
* | | Merge pull request #33308 from anniecodes/notes-command-changelogRafael França2018-07-091-0/+19
|\ \ \ | | | | | | | | Add rake notes and SOURCE_ANNOTATION_DIRECTORIES deprecation to Changelog
| * | | Add deprecations related to `rails notes` command to ChangelogAnnie-Claude Côté2018-07-091-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * SOURCE_ANNOTATION_DIRECTORIES deprecation * Deprecation of `rake notes`, use `rails notes` instead * Deprecation of `rails notes:custom ANNOTATION=custom`, `rails notes:optimize`, `rails notes:todo`, and `rails notes:fixme` in favor of passing `-annotations` or `-a` to `rails notes` * They have all been deprecrated in https://github.com/rails/rails/pull/33220
* | | | SQLite: Don't leak internal schema objectsRyuta Kamizono2018-07-093-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related #31201. If creating custom primary key (like a string) in SQLite, it would also create an internal index implicitly which named begin with "sqlite_". It need to be hidden since the internal object names are reserved and prohibited for public use. See https://www.sqlite.org/fileformat2.html#intschema Fixes #33320.