Skip to content
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.

Sign up for GitHub

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

Jump to bottom

stopwatch notif: check if timetracking is enabled #14750

Merged
merged 2 commits into from
Feb 19, 2021
Merged

stopwatch notif: check if timetracking is enabled #14750

merged 2 commits into from
Feb 19, 2021

Conversation

noerw
Copy link
Member

@noerw noerw commented Feb 19, 2021

fixes #14435

@noerw noerw added type/bug skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Feb 19, 2021
@noerw noerw added this to the 1.14.0 milestone Feb 19, 2021
techknowlogick
techknowlogick reviewed Feb 19, 2021
View reviewed changes
templates/base/head.tmpl
@@ -42,6 +42,7 @@
MaxTimeout: {{NotificationSettings.MaxTimeout}},
EventSourceUpdateTime: {{NotificationSettings.EventSourceUpdateTime}},
},
EnableTimetracking: {{if EnableTimetracking}}true{{else}}false{{end}},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as a side note, we could probably get these into the system info api endpoint to better integrate SPAs in the future (this isn't a note for this PR though).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same with lfs enable/disable info ... - will add a pull

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#14753

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

awesome. thanks :)

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 19, 2021
@GiteaBot 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 Feb 19, 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 Feb 19, 2021
@6543
Copy link
Member

6543 commented Feb 19, 2021

🚀

@6543 6543 merged commit 91424ff into go-gitea:master Feb 19, 2021
@6543 6543 deleted the fix-14435 branch February 19, 2021 23:07
@go-gitea go-gitea locked and limited conversation to collaborators May 13, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@techknowlogick techknowlogick techknowlogick left review comments

@6543 6543 6543 approved these changes

@zeripath zeripath zeripath approved these changes

Assignees
No one assigned
Labels
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
Milestone
1.14.0
Development

Successfully merging this pull request may close these issues.

stopwatches endpoint should not be triggered when ENABLE_TIMETRACKING = false
5 participants
@noerw @6543 @techknowlogick @zeripath @GiteaBot