aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* s/an/a/Akira Matsuda2017-11-041-1/+1
|
* Merge pull request #31048 from ↵Ryuta Kamizono2017-11-041-4/+14
|\ | | | | | | | | bogdanvlviv/improve-docs-for-action_dispatch-routing-mapper Improve docs of ActionDispatch::Routing::Mapper [ci skip]
| * Improve docs of ActionDispatch::Routing::Mapperbogdanvlviv2017-11-031-4/+14
| |
* | Merge pull request #31050 from y-yagi/remove_unused_methodsRyuta Kamizono2017-11-041-8/+0
|\ \ | |/ |/| Remove unused `calculate_rounded_number` and `digit_count`
| * Remove unused `calculate_rounded_number` and `digit_count`yuuji.yaginuma2017-11-041-8/+0
|/ | | | These methods unused since 5533696.
* Permit configuring Active Storage's job queueGeorge Claghorn2017-11-035-16/+13
|
* Revert "Merge pull request #31025 from y-yagi/follow_up_31023_part2"Ryuta Kamizono2017-11-031-1/+0
| | | | | | | This reverts commit 6f481e05bb24fe3589ef0f65e97a9b1fa66ae0f7, reversing changes made to 592f790b7693c0a32cd06d5e8201639923a734c5. In favor of #31039.
* Merge pull request #31039 from y-yagi/fix_guides_buildRyuta Kamizono2017-11-036-0/+12
|\ | | | | Fix guides build
| * Specify bundler version in template filesyuuji.yaginuma2017-11-036-0/+12
|/ | | | | | | | | | | | We have already specified to install `bundler` 1.15.4 in `.travis.yml`. https://github.com/rails/rails/blob/master/.travis.yml#L31..L32 However, `bundler` 1.16.0 may be used in the test. https://travis-ci.org/rails/rails/jobs/296582467#L2208 The test failed due to this influence. In order to avoid this, specifying `bundler` version in bug report templates.
* Merge pull request #31038 from y-yagi/remove_unused_classesRafael França2017-11-021-30/+0
|\ | | | | Remove unused classes
| * Remove unused classesyuuji.yaginuma2017-11-031-30/+0
|/ | | | | | * `HasManyThroughCantDissociateNewRecords` and `HasManyThroughCantAssociateNewRecords` are no longer used since f6b12c1. * `ReadOnlyAssociation` is no longer used since 0da426b.
* Allow third-party previewers/analyzers to customize their tempdirsGeorge Claghorn2017-11-022-3/+10
|
* Merge pull request #31034 from haneru/edit-commentEileen M. Uchitelle2017-11-021-1/+1
|\ | | | | [ci skip]Fix typo in comments.
| * Edited comment from request.rbhaneru2017-11-031-1/+1
| |
* | Merge pull request #31031 from y-yagi/fix_ruby_warning_when_using_test_toolRyuta Kamizono2017-11-021-1/+1
|\ \ | | | | | | Fix "warning: instance variable @defined_root not initialized"
| * | Fix "warning: instance variable @defined_root not initialized"yuuji.yaginuma2017-11-021-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the following error is shows only when run the test using `bin/test`. ``` ./bin/test -w test/template/log_subscriber_test.rb Run options: --seed 17167 # Running: /rails/actionview/test/template/log_subscriber_test.rb:34: warning: instance variable @defined_root not initialized ``` In `AVLogSubscriberTest`, if the `Rails.root` is not defined, define the method and undef it in teardown. https://github.com/rails/rails/blob/master/actionview/test/template/log_subscriber_test.rb#L21..L33 However, in `bin/test`, `Rails.root` is defined, which results in referring to uninitialized variables and warnings.
* | Merge pull request #31029 from yahonda/ignore_uninstall_bundler_at_ruby_headGuillermo Iguaran2017-11-011-1/+1
|\ \ | | | | | | Ignore "gem "bundler" cannot be uninstalled because it is a default gem" error when tested with ruby-head
| * | Ignore "gem "bundler" cannot be uninstalled because it is a default gem" errorYasuo Honda2017-11-011-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when tested with ruby-head This pull request attempts to ignore the following error when tested with ruby-head which has bundler as a default gem. ```ruby $ rvm @global do gem uninstall bundler --all --ignore-dependencies --executables ERROR: While executing gem ... (Gem::InstallError) gem "bundler" cannot be uninstalled because it is a default gem The command "rvm @global do gem uninstall bundler --all --ignore-dependencies --executables" failed and exited with 1 during . ``` Refer https://travis-ci.org/rails/rails/jobs/295600391 This workaround should be removed once https://github.com/bundler/bundler/issues/6072 is addressed.
* | updates autoloading guide for Ruby 2.5 [ci skip]Xavier Noria2017-11-011-1/+9
| |
* | Fix tests on Mail 2.7Jeremy Daer2017-10-314-23/+18
| | | | | | | | | | Reverts 4d96be1c27bd6faed957b197a461f18543acebf2 References #31026
* | Merge pull request #31026 from yahonda/diag_mail27Rafael França2017-10-312-0/+4
|\ \ | | | | | | Workaround for ActionMailer failures by not installing mail 2.7
| * | Workaround for ActionMailer failures by not installing mail 2.7Yasuo Honda2017-11-012-0/+4
|/ / | | | | | | | | | | | | | | | | | | ```ruby TestHelperMailerTest#test_encode BaseTest#test_implicit_multipart_with_attachments_creates_nested_parts BaseTest#test_implicit_multipart_with_attachments_and_sort_order BaseTest#test_explicit_multipart_with_attachments_creates_nested_parts ``` Refer https://travis-ci.org/rails/rails/jobs/295571582
* | Merge pull request #31025 from y-yagi/follow_up_31023_part2Guillermo Iguaran2017-10-311-0/+1
|\ \ | | | | | | Remove bundler 1.16.0
| * | Remove bundler 1.16.0yuuji.yaginuma2017-11-011-0/+1
|/ / | | | | | | | | | | | | | | Since 1.16.0 is installed by default, it seems that the newer one will be used even if specify an older version. Ref: https://travis-ci.org/rails/rails/jobs/295553738#L1718 Follow up of #31023
* | Merge pull request #31023 from y-yagi/avoid_latest_bundlerGuillermo Iguaran2017-10-311-1/+1
|\ \ | | | | | | Avoid bundler 1.16.0 for now
| * | Avoid bundler 1.16.0 for nowyuuji.yaginuma2017-11-011-1/+1
| | | | | | | | | | | | | | | It's causing bug report template tests to fail. https://travis-ci.org/rails/rails/jobs/295520851 This seems an issue of bundler. Ref: https://github.com/bundler/bundler/issues/6072
* | | Fix failing `bundle install` on CIRyuta Kamizono2017-11-011-1/+1
| | | | | | | | | | | | https://travis-ci.org/rails/rails/jobs/295470534#L2133
* | | Enable `Style/RedundantReturn` rubocop rule, and fixed a couple moreRyuta Kamizono2017-11-015-10/+14
|/ / | | | | | | Follow up of #31004.
* | Merge pull request #31021 from yahonda/add_all_sequences_to_oracle_ignoredMatthew Draper2017-11-011-1/+1
|\ \ | | | | | | Address incorrect number of queries executed at Oracle enhanced adapter
| * | Address incorrect number of queries executed at Oracle enhanced adapterYasuo Honda2017-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This pull request addresses these 17 failures when tested with Oracle enhanced adapter. All of these failures are due to the incorrect number of queries. Here is the first one. ```ruby $ ARCONN=oracle bin/test test/cases/nested_attributes_test.rb:1086 Using oracle Run options: --seed 27985 F Finished in 0.874514s, 1.1435 runs/s, 1.1435 assertions/s. 1) Failure: TestHasManyAutosaveAssociationWhichItselfHasAutosaveAssociations#test_circular_references_do_not_perform_unnecessary_queries [/home/yahonda/git/rails/activerecord/test/cases/nested_attributes_test.rb:1086]: 6 instead of 3 queries were executed. Queries: select us.sequence_name from all_sequences us where us.sequence_owner = :owner and us.sequence_name = :sequence_name INSERT INTO "SHIPS" ("NAME", "ID") VALUES (:a1, :a2) select us.sequence_name from all_sequences us where us.sequence_owner = :owner and us.sequence_name = :sequence_name INSERT INTO "SHIP_PARTS" ("NAME", "SHIP_ID", "UPDATED_AT", "ID") VALUES (:a1, :a2, :a3, :a4) select us.sequence_name from all_sequences us where us.sequence_owner = :owner and us.sequence_name = :sequence_name INSERT INTO "TREASURES" ("LOOTER_ID", "LOOTER_TYPE", "SHIP_ID", "ID") VALUES (:a1, :a2, :a3, :a4). Expected: 3 Actual: 6 1 runs, 1 assertions, 1 failures, 0 errors, 0 skips $ ``` Since https://github.com/rsim/oracle-enhanced/pull/1490 Oracle enhanced adapter drops its own schema caching called OracleEnhancedAdapter.cache_columns` to use Rails scehema cache generated by `db:schema:cache:dump`. By this change some extra sql statements executed at ActiveRecord unit test, which can be fixed by adding the sql statement to `oracle_ignored`. * All 17 failures fixed by this pull request: ```ruby ARCONN=oracle bin/test test/cases/nested_attributes_test.rb:1086 ARCONN=oracle bin/test test/cases/locking_test.rb:308 ARCONN=oracle bin/test test/cases/locking_test.rb:365 ARCONN=oracle bin/test test/cases/dirty_test.rb:351 ARCONN=oracle bin/test test/cases/dirty_test.rb:334 ARCONN=oracle bin/test test/cases/autosave_association_test.rb:192 ARCONN=oracle bin/test test/cases/associations/has_many_associations_test.rb:950 ARCONN=oracle bin/test test/cases/associations/has_many_associations_test.rb:1059 ARCONN=oracle bin/test test/cases/autosave_association_test.rb:627 ARCONN=oracle bin/test test/cases/autosave_association_test.rb:607 ARCONN=oracle bin/test test/cases/autosave_association_test.rb:617 ARCONN=oracle bin/test test/cases/autosave_association_test.rb:641 ARCONN=oracle bin/test test/cases/associations/has_many_through_associations_test.rb:546 ARCONN=oracle bin/test test/cases/associations/has_many_through_associations_test.rb:297 ARCONN=oracle bin/test test/cases/associations/has_many_through_associations_test.rb:586 ARCONN=oracle bin/test test/cases/associations/has_many_through_associations_test.rb:172 ARCONN=oracle bin/test test/cases/associations/has_many_through_associations_test.rb:269 ```
* | | Fix grammar issue [ci skip]Rafael França2017-10-311-1/+1
|/ / | | | | Closes #31018
* | Merge pull request #31013 from dgynn/rescue-layout-white-space-wrappingRafael França2017-10-311-0/+1
|\ \ | | | | | | Prevent source line wrapping in rescue layout
| * | Prevent source line wrapping in rescue layoutDave Gynn2017-10-311-0/+1
|/ / | | | | | | | | | | Long source lines cause line wrapping in the extracted source section of the rescue handler page which can make the line numbers not match up with the source lines.
* | Merge pull request #31004 from shuheiktgw/remove_unnecessary_returnsRafael França2017-10-3112-16/+16
|\ \ | | | | | | Remove redundant return statements
| * | removed unnecessary returnsShuhei Kitagawa2017-10-2812-16/+16
| | |
* | | Merge pull request #31012 from y-yagi/remove_unused_missing_requests_errorRafael França2017-10-302-4/+0
|\ \ \ | |_|/ |/| | Remove unused `MissingRequestError`
| * | Remove unused `MissingRequestError`yuuji.yaginuma2017-10-312-4/+0
| | | | | | | | | | | | `MissingRequestError` is no longer used since 1e2b0ce.
* | | `source_type_scope` should respect correct table aliasRyuta Kamizono2017-10-302-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | `join_scopes` in `PolymorphicReflection` is passed aliased `table`, so it should be respected for `source_type_scope`. Closes #13969. Fixes #13920. Fixes #15190.
* | | `PolymorphicReflection#scopes` is no longer used since a5651eb5Ryuta Kamizono2017-10-301-5/+0
| | |
* | | Merge pull request #31002 from ta1kt0me/call_ajax_without_beforeSendGuillermo Iguaran2017-10-293-2/+29
|\ \ \ | | | | | | | | Call Rails.ajax without beforeSend
| * | | Enable to call Rails.ajax without beforeSendta1kt0me2017-10-283-2/+29
| | | |
* | | | Merge pull request #31007 from suginoy/doc_integer_bigintRyuta Kamizono2017-10-294-20/+20
|\ \ \ \ | | | | | | | | | | [ci skip]Update the documentation about the primary key type
| * | | | [ci skip]Update the documentation about the primary key typesuginoy2017-10-294-20/+20
|/ / / / | | | | | | | | | | | | | | | | | | | | Replace the primary key type `integer` in docs with `bigint`. ref #26266
* | | | Merge pull request #30996 from tscoville2012/tscoville2012-patch-1Eileen M. Uchitelle2017-10-281-0/+4
|\ \ \ \ | | | | | | | | | | 5_1_release_notes include more removals [ci skip]
| * | | | [ci skip] Updated 5_1_release_notes.md to include support to :text and ↵Tyler Scoville2017-10-271-0/+4
| | |/ / | |/| | | | | | | | | | :nothing in render
* | | | Merge pull request #31005 from shuheiktgw/remove_unnecessary_semicolonsMatthew Draper2017-10-2811-20/+24
|\ \ \ \ | | | | | | | | | | | | | | | Removed unnecessary semicolons
| * | | | removed unnecessary semicolonsShuhei Kitagawa2017-10-287-17/+17
| | |_|/ | |/| |
* / | | Keep rubocop happy with the new Selenium runnerMatthew Draper2017-10-281-4/+6
|/ / /
* | | Merge pull request #31003 from y-yagi/add_load_hook_for_system_test_caseRyuta Kamizono2017-10-282-0/+3
|\ \ \ | | | | | | | | Add load hook for `ActionDispatch::SystemTestCase`
| * | | Add load hook for `ActionDispatch::SystemTestCase`yuuji.yaginuma2017-10-282-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | This is useful to extend `SystemTestCase`. Also, since other test classes already have load hooks, should also be in `SystemTestCase`. Ref: 0510208dd1ff23baa619884c0abcae4d141fae53
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 06:34:25 +0000