aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #31706 from mrhead/fix-test-case-nameRyuta Kamizono2018-01-141-1/+1
|\ | | | | Change test case name to FormatValidationTest
| * Change test case name to FormatValidationTestPatrik Bóna2018-01-141-1/+1
|/ | | | I believe that this was caused by a copy/paste mistake.
* Don't need to pass `manager` to `convert_join_strings_to_ast`Ryuta Kamizono2018-01-141-2/+2
| | | | Because `Relation` already have Arel `table`.
* Don't pass garbage args to alias trackerRyuta Kamizono2018-01-142-11/+4
| | | | | | | | | | | | | This is a complete fix to #30995. Originally alias tracker will only track table aliases on `Arel::Nodes::Join`, other args are ignored. Since c5ab6e5, parent aliases hash will be passed then it caused the regression #30995. It is enough to pass list of `Arel::Nodes::Join` simply, not need to pass garbage args which will be ignored.
* Merge pull request #31572 from kami-zh/fix-templateYuji Yaginuma2018-01-131-2/+3
|\ | | | | Fix comment about initializers to adapt to the fact
| * Fix comment about initializers to adapt to the factkami-zh2017-12-271-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently the comment says application configuration should go into files in `config/initializers`. However some configuration couldn't initialize correctly because of the initializing process(e.g. `config.time_zone`). It should be changed by framework but this is large change and it may occur malfunction to some applications which depends on current initializing process. So this comment is changed to adapt to the fact.
* | `deep_dup` is used in `AttributeSet#deep_dup`Ryuta Kamizono2018-01-132-1/+1
| |
* | Merge pull request #31651 from eugeneius/use_sha1_digestsSean Griffin2018-01-128-17/+32
|\ \ | | | | | | Use SHA-1 for non-sensitive digests by default
| * | Use SHA-1 for non-sensitive digests by defaultEugene Kenny2018-01-088-17/+32
| | | | | | | | | | | | | | | | | | Instead of providing a configuration option to set the hash function, switch to SHA-1 for new apps and allow upgrading apps to opt in later via `new_framework_defaults_5_2.rb`.
* | | Merge pull request #31695 from tcopeland/fix_typoRafael França2018-01-121-1/+1
|\ \ \ | | | | | | | | Fix doc typo [ci-skip]
| * | | Fix doc typo [ci-skip]Tom Copeland2018-01-121-1/+1
|/ / /
* | | Merge pull request #31675 from Dorian/fix-some-broken-links-in-guidesEileen M. Uchitelle2018-01-124-9/+9
|\ \ \ | | | | | | | | Fix some broken links in guides
| * | | Fix some broken links in guidesDorian Marié2018-01-114-9/+9
| | | |
* | | | Use unsafe_inline as the default for script_src CSP until we get a nonce ↵David Heinemeier Hansson2018-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | alternative Closes #31273 but we will still want to upgrade this to the nonce-approach when it’s ready.
* | | | Add note about having to restart when modifying initializerDavid Heinemeier Hansson2018-01-121-0/+2
| | | |
* | | | Use complete variable names rather than single-letter abbreviations for styleDavid Heinemeier Hansson2018-01-121-8/+8
| | | |
* | | | Merge pull request #31682 from jameslovejoy/fix-rdoc-typos-documentationMatthew Draper2018-01-125-27/+33
|\ \ \ \ | | | | | | | | | | Fix typos, update documentation
| * | | | Fix typos, update documentationJames Lovejoy2018-01-115-27/+33
|/ / / / | | | | | | | | | | | | [ci skip]
* | | | Use my fork instead of an thrid-party forkRafael Mendonça França2018-01-112-9/+9
| | | | | | | | | | | | | | | | | | | | This will avoid the branch being deleted by mistake making all builds to fail.
* | | | Merge pull request #31671 from larskanis/pg-1.0Rafael Mendonça França2018-01-116-12/+12
|\ \ \ \ | |/ / / |/| | | | | | | PostgreSQL: Allow pg-1.0 gem to be used with ActiveRecord
| * | | PostgreSQL: Update Gemfile to pg-1.0.0Lars Kanis2018-01-102-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Queue_classic currently limits pg to "< 0.20". It is therefore not used for rails CI tests. There has been a bull request for a while (by a co-worker of mine), which fixes the incompatibilities and extends dependencies to pg-1.x. This patch add this pull request to the Gemfile as an interim solution, until it is merged.
| * | | PostgreSQL: Allow pg-1.0 gem to be used with ActiveRecordLars Kanis2018-01-104-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pg-1.0.0 is just released and most Gemfiles don't restrict it's version. But the version is checked when connecting to the database, which leads to the following error: Gem::LoadError: can't activate pg (~> 0.18), already activated pg-1.0.0 See also this pg issue: https://bitbucket.org/ged/ruby-pg/issues/270/pg-100-x64-mingw32-rails-server-not-start Preparation for pg-1.0 was done in commit f28a331023fab, but the pg version constraint was not yet relaxed.
* | | | Merge pull request #31653 from ydakuka/fix-typo-0801Eileen M. Uchitelle2018-01-115-5/+5
|\ \ \ \ | | | | | | | | | | Fix typos [ci skip]
| * | | | Fix typos [ci skip]Yauheni Dakuka2018-01-115-5/+5
| | | | |
* | | | | Instrument image transformationGeorge Claghorn2018-01-101-7/+9
| | | | |
* | | | | Instrument preview image drawingGeorge Claghorn2018-01-101-3/+5
| | | | |
* | | | | Merge pull request #30268 from ignatiusreza/instrumentationRyuta Kamizono2018-01-114-49/+64
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | add instrumentation for read_multi
| * | | | | add instrumentation for read_multiIgnatius Reza2017-12-294-49/+64
| | | | | | | | | | | | | | | | | | | | | | | | currently it's not possible to know what the hit rates are from read_multi
* | | | | | Merge pull request #31624 from y-yagi/fix_minitest_511Aaron Patterson2018-01-105-11/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add support for Minitest 5.11
| * | | | | | Need to use `klass` to get the class name of the test resultyuuji.yaginuma2018-01-032-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref: http://docs.seattlerb.org/minitest/Minitest/Result.html#attribute-i-klass
| * | | | | | Correctly get source locationyuuji.yaginuma2018-01-032-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `filtered_results` returns an instance of `Minitest::Result` since https://github.com/seattlerb/minitest/commit/00433fc0a4fdd0e6b302aace633384ba13122376 `Minitest::Result` is not test class. So cannot get location directly.
| * | | | | | Use `Minitest::Result` for retain test resultyuuji.yaginuma2018-01-031-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Runnable.marshal_dump/load was removed in https://github.com/seattlerb/minitest/commit/00433fc0a4fdd0e6b302aace633384ba1312237 Instead, `Minitest::Result` is contained test result and the that can be marshalled.
| * | | | | | Bump Minitest to 5.11.1yuuji.yaginuma2018-01-032-3/+1
| | | | | | |
* | | | | | | Merge pull request #23146 from piotrj/issue_18424Ryuta Kamizono2018-01-114-0/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | When deleting through records, take into account association conditions
| * | | | | | | When deleting through records, take into account association conditionsPiotr Jakubowski2016-05-043-8/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #18424. When deleting through records, it didn't take into account the conditions that may have been affecting join model table, but was defined in association definition.
* | | | | | | | Remove the deprecated `:conditions` option in ↵Ryuta Kamizono2018-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `INVALID_AUTOMATIC_INVERSE_OPTIONS` This option was moved into active_record_deprecated_finders in ac4d101.
* | | | | | | | Use `apply_join_dependency` instead of meaningless named ↵Ryuta Kamizono2018-01-112-26/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `find_with_associations` `find_with_associations` is meaningless name in this point since it just contain `construct_join_dependency` and `apply_join_dependency`, does not contain finding anything. If `apply_join_dependency` returns `relation` and `join_dependency` then `find_with_associations` is no longer needed.
* | | | | | | | Make `relation.exists?` more performant when using eager loadingRyuta Kamizono2018-01-112-13/+16
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `relation.exists?` just wants to know if there is a result or not, does not need the exact records matched. Therefore, an intermediate SELECT query for eager loading is not necessary.
* | | | | | | Update error names in docs [ci skip]George Claghorn2018-01-101-3/+3
| | | | | | |
* | | | | | | Add missing `# frozen_string_literal: true`Ryuta Kamizono2018-01-113-0/+6
| | | | | | |
* | | | | | | Merge pull request #31446 from bdewater/inverse-of-options-docsRyuta Kamizono2018-01-112-26/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix :inverse_of documentation
| * | | | | | | [ci skip] setting :inverse_of works with :as, :through and :polymorphic ↵Bart de Water2018-01-102-29/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | options, and is needed for bi-directionality with a scope [ci skip] Remove :conditions opion from association basics guide This got replaced by scopes.
* | | | | | | | Correct comment [ci skip]George Claghorn2018-01-101-1/+1
| | | | | | | |
* | | | | | | | Extract Analyzable and Representable concernsGeorge Claghorn2018-01-108-150/+158
|/ / / / / / /
* | | | | | | Fix `stale_state` for nested `has_many :through` associationsRyuta Kamizono2018-01-103-22/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Need reloading when through record has replaced.
* | | | | | | Merge pull request #31667 from bogdanvlviv/clean-up-railties-testsYuji Yaginuma2018-01-102-19/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Clean up railties tests
| * | | | | | | Clean up railties testsbogdanvlviv2018-01-102-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove `AppGeneratorTest#test_active_storage_install`. The test is added by 67db41aa7f17c2d34eb5a914ac7a6b2574930ff4, since #31534 this test doesn't test anything. Remove redundant assertions in `SharedGeneratorTests`. These assertions is added by 4a835aa3236eedb135ccf8b59ed3c03e040b8b01. Follows 67db41aa7f17c2d34eb5a914ac7a6b2574930ff4, #31534.
* | | | | | | | Merge pull request #16314 from ↵Ryuta Kamizono2018-01-104-1/+76
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zoltankiss/allow-nested-has-many-associations-on-unpersisted-parent-instances fix nested `has many :through` associations on unpersisted parent instances
| * | | | | | | Fix nested `has many :through` associations on unpersisted instancesZoltan Kiss2015-03-264-1/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16313
* | | | | | | | Fix "the the " [ci skip]Ryuta Kamizono2018-01-103-3/+3
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 06:42:19 +0000