Skip to content

Only write config in environment-to-ini if there are changes (#15861)#15868

Merged
zeripath merged 3 commits into
go-gitea:release/v1.14from
zeripath:backport-15861-v1.14
May 15, 2021
Merged

Only write config in environment-to-ini if there are changes (#15861)#15868
zeripath merged 3 commits into
go-gitea:release/v1.14from
zeripath:backport-15861-v1.14

Conversation

@zeripath
Copy link
Copy Markdown
Contributor

@zeripath zeripath commented May 14, 2021

Backport #15861

  • Only write config in environment-to-ini if there are changes

Only write the new config in environment-to-ini if there are changes or the
destination is not the same as the customconf.

Fix #15719
Fix #15857

Signed-off-by: Andrew Thornton art27@cantab.net
Co-authored-by: 6543 6543@obermui.de

@zeripath zeripath added this to the 1.14.3 milestone May 14, 2021
…a#15861)

Backport go-gitea#15861

* Only write config in environment-to-ini if there are changes

Only write the new config in environment-to-ini if there are changes or the
destination is not the same as the customconf.

Fix go-gitea#15719
Fix go-gitea#15857

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: 6543 <6543@obermui.de>
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label May 14, 2021
@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 May 15, 2021
@zeripath
Copy link
Copy Markdown
Contributor Author

make lgtm work

@zeripath zeripath merged commit fa96ddb into go-gitea:release/v1.14 May 15, 2021
@zeripath zeripath deleted the backport-15861-v1.14 branch May 15, 2021 12:07
@go-gitea go-gitea locked and limited conversation to collaborators Oct 19, 2021
@delvh delvh added topic/distribution This PR changes something about the packaging of Gitea and removed theme/docker labels Oct 7, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. topic/deployment topic/distribution This PR changes something about the packaging of Gitea

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants