-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Ensure minimum mirror interval is reported on settings page #19895
Merged
techknowlogick
merged 7 commits into
go-gitea:main
from
zeripath:fix-3737-report-minimum-mirror-interval
Jun 7, 2022
Merged
Ensure minimum mirror interval is reported on settings page #19895
techknowlogick
merged 7 commits into
go-gitea:main
from
zeripath:fix-3737-report-minimum-mirror-interval
Jun 7, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Expecting users to guess the minimum mirror interval appears a little unkind. In this PR we simply change the locale string to include the minimum interval. This will of course be affected by our current localization framework but... we can fix that else where. This PR also includes some fixes for error handling on the settings page as previously the mirror block amongst others would simply disappear on error. Fix go-gitea#3737 Signed-off-by: Andrew Thornton <art27@cantab.net>
Gusted
reviewed
Jun 5, 2022
Comment on lines
+107
to
+117
ctx.Data["ForcePrivate"] = setting.Repository.ForcePrivate | ||
ctx.Data["MirrorsEnabled"] = setting.Mirror.Enabled | ||
ctx.Data["DisableNewPushMirrors"] = setting.Mirror.DisableNewPush | ||
ctx.Data["DefaultMirrorInterval"] = setting.Mirror.DefaultInterval | ||
ctx.Data["MinimumMirrorInterval"] = setting.Mirror.MinInterval | ||
|
||
signing, _ := asymkey_service.SigningKey(ctx, ctx.Repo.Repository.RepoPath()) | ||
ctx.Data["SigningKeyAvailable"] = len(signing) > 0 | ||
ctx.Data["SigningSettings"] = setting.Repository.Signing | ||
ctx.Data["CodeIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FYI this will conflict with #19828
GiteaBot
added
the
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
label
Jun 5, 2022
Co-authored-by: Gusted <williamzijl7@hotmail.com>
Gusted
approved these changes
Jun 5, 2022
GiteaBot
added
lgtm/need 1
This PR needs approval from one additional maintainer to be merged.
and removed
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
labels
Jun 5, 2022
Signed-off-by: Andrew Thornton <art27@cantab.net>
…-interval' into fix-3737-report-minimum-mirror-interval
wxiaoguang
reviewed
Jun 6, 2022
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
wxiaoguang
approved these changes
Jun 7, 2022
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
Jun 7, 2022
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Jun 9, 2022
* giteaofficial/main: Prevent NPE whilst migrating if there is a team request review (go-gitea#19855) [skip ci] Updated translations via Crowdin Add support for rendering terminal output with colors (go-gitea#19497) Fix viewed images not loading in a PR (go-gitea#19919) Remove out-dated comments (go-gitea#19921) Automatically render wiki TOC (go-gitea#19873) Improve wording on delete access token modal (go-gitea#19909) [skip ci] Updated translations via Crowdin Add breaking email restrictions checker in doctor (go-gitea#19903) Ensure minimum mirror interval is reported on settings page (go-gitea#19895) Improve UX on modal for deleting an access token (go-gitea#19894) update discord invite (go-gitea#19907) Only log non ErrNotExist errors in git.GetNote (go-gitea#19884) [skip ci] Updated translations via Crowdin Update frontend guideline (go-gitea#19901) Make AppDataPath absolute against the AppWorkPath if it is not (go-gitea#19815)
AbdulrhmnGhanem
pushed a commit
to kitspace/gitea
that referenced
this pull request
Aug 24, 2022
…#19895) * Ensure minimum mirror interval is reported on settings page Expecting users to guess the minimum mirror interval appears a little unkind. In this PR we simply change the locale string to include the minimum interval. This will of course be affected by our current localization framework but... we can fix that else where. This PR also includes some fixes for error handling on the settings page as previously the mirror block amongst others would simply disappear on error. Fix go-gitea#3737 Signed-off-by: Andrew Thornton <art27@cantab.net> * Update options/locale/locale_en-US.ini Co-authored-by: Gusted <williamzijl7@hotmail.com> * placate lint Signed-off-by: Andrew Thornton <art27@cantab.net> * Update options/locale/locale_en-US.ini Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: Gusted <williamzijl7@hotmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Expecting users to guess the minimum mirror interval appears a little unkind.
In this PR we simply change the locale string to include the minimum interval.
This will of course be affected by our current localization framework but...
we can fix that else where.
This PR also includes some fixes for error handling on the settings page as
previously the mirror block amongst others would simply disappear on error.
Fix #3737
Signed-off-by: Andrew Thornton art27@cantab.net