Skip to content

Conversation

huww98
Copy link
Contributor

@huww98 huww98 commented Dec 21, 2020

Following up my previous PR.

The previous version fails these new tests:

--- FAIL: Test_getStorageSpecificOverridesStorage (0.00s)
    storage_test.go:95: 
                Error Trace:    storage_test.go:95
                Error:          Not equal: 
                                expected: "minio"
                                actual  : "local"
                            
                                Diff:
                                --- Expected
                                +++ Actual
                                @@ -1 +1 @@
                                -minio
                                +local
                Test:           Test_getStorageSpecificOverridesStorage
--- FAIL: Test_getStorageInheritNameSectionType (0.00s)
    storage_test.go:196: 
                Error Trace:    storage_test.go:196
                Error:          Not equal: 
                                expected: "minio"
                                actual  : ""
                            
                                Diff:
                                --- Expected
                                +++ Actual
                                @@ -1 +1 @@
                                -minio
                                +
                Test:           Test_getStorageInheritNameSectionType
FAIL
FAIL    code.gitea.io/gitea/modules/setting     0.021s
FAIL

Signed-off-by: 胡玮文 <huww98@outlook.com>
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Dec 21, 2020
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Dec 21, 2020
@lafriks lafriks merged commit c21a399 into go-gitea:master Dec 21, 2020
@lafriks lafriks added this to the 1.14.0 milestone Dec 21, 2020
@lafriks
Copy link
Member

lafriks commented Dec 21, 2020

please send backport

@6543 6543 added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Dec 21, 2020
@6543
Copy link
Member

6543 commented Dec 21, 2020

added ref to #14091 ...so do not need to have it twice in changelog ...

6543 pushed a commit to 6543-forks/gitea that referenced this pull request Dec 22, 2020
lafriks pushed a commit that referenced this pull request Dec 22, 2020
Signed-off-by: 胡玮文 <huww98@outlook.com>

Co-authored-by: 胡玮文 <huww98@outlook.com>
@zeripath zeripath added the backport/done All backports for this PR have been created label Dec 26, 2020
@go-gitea go-gitea locked and limited conversation to collaborators Feb 11, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants