github-starred/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-05-06 02:02:32 -05:00
Code Issues 2.6k Packages Projects Releases 100 Wiki Activity

[PR #4327] [MERGED] Automatically clear stopwatch on merging a PR #17333

New Issue
Closed
opened 2025-11-02 12:32:49 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-02 12:32:49 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/go-gitea/gitea/pull/4327
Author: @adelowo
Created: 6/27/2018
Status: ✅ Merged
Merged: 2/5/2019
Merged by: @lafriks

Base: master ← Head: stop_watch_on_merging_pr

📝 Commits (10+)

📊 Changes

6 files changed (+49 additions, -2 deletions)

View changed files

📝 models/action.go (+14 -2)
📝 options/locale/locale_en-US.ini (+1 -0)
📝 routers/repo/issue.go (+6 -0)
📝 routers/repo/issue_stopwatch.go (+11 -0)
📝 routers/repo/pull.go (+16 -0)
📝 templates/repo/issue/view_content/comments.tmpl (+1 -0)

📄 Description

Whenever a timer is created, it should be closed automatically whenever the PR is merged and/or an issue/PR is closed as per https://github.com/go-gitea/gitea/pull/4327#issuecomment-401553843 . This PR adds that functionality .

This uses ctx.Flash to show a one time message that the timer would be closed automatically as per https://github.com/go-gitea/gitea/pull/4327#issuecomment-403326074

screen shot 2018-07-14 at 17 36 53

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/go-gitea/gitea/pull/4327 **Author:** [@adelowo](https://github.com/adelowo) **Created:** 6/27/2018 **Status:** ✅ Merged **Merged:** 2/5/2019 **Merged by:** [@lafriks](https://github.com/lafriks) **Base:** `master` ← **Head:** `stop_watch_on_merging_pr` --- ### 📝 Commits (10+) - [`d8f2043`](https://github.com/go-gitea/gitea/commit/d8f20438b2aae1bdcac43a1369444df6149e8b82) Don't display buttons if there are no notices - [`fd55ef4`](https://github.com/go-gitea/gitea/commit/fd55ef478cf518936f7e407f464439e6de0ca159) clear stopwatch on merging a PR - [`d5752d4`](https://github.com/go-gitea/gitea/commit/d5752d4ba570f7013d5396e60b2e828692e79bf4) remove redundant gt check - [`93b187a`](https://github.com/go-gitea/gitea/commit/93b187ae19ea0e2502c3afff2e6d15d31fce091d) Merge remote-tracking branch 'origin' - [`3fa1e4f`](https://github.com/go-gitea/gitea/commit/3fa1e4fca4548dc41adb07f92557f5a8ec2c7d7a) Merge branch 'master' into stop_watch_on_merging_pr - [`852514f`](https://github.com/go-gitea/gitea/commit/852514f3b92486f5b19a76461ffdc2dedb184991) Merge remote-tracking branch 'origin' into stop_watch_on_merging_pr - [`dff2c69`](https://github.com/go-gitea/gitea/commit/dff2c69a3616bbcb3a2a33bfe8be9766e43b4647) Merge branch 'master' of https://github.com/go-gitea/gitea into stop_watch_on_merging_pr - [`bb7b73e`](https://github.com/go-gitea/gitea/commit/bb7b73e46f70e29b3e17c3ea34284cbaa1c2536f) use ctx.Flash as per @bkcsoft comment - [`58edfc9`](https://github.com/go-gitea/gitea/commit/58edfc93a32c85317e410e4d0b8923c80f221b0d) Merge branch 'master' of https://github.com/go-gitea/gitea into stop_watch_on_merging_pr - [`88beb1c`](https://github.com/go-gitea/gitea/commit/88beb1cef8f259adadc03cb21bc27af58ece4550) stop timer on closing issues/PRs too ### 📊 Changes **6 files changed** (+49 additions, -2 deletions) <details> <summary>View changed files</summary> 📝 `models/action.go` (+14 -2) 📝 `options/locale/locale_en-US.ini` (+1 -0) 📝 `routers/repo/issue.go` (+6 -0) 📝 `routers/repo/issue_stopwatch.go` (+11 -0) 📝 `routers/repo/pull.go` (+16 -0) 📝 `templates/repo/issue/view_content/comments.tmpl` (+1 -0) </details> ### 📄 Description Whenever a timer is created, it should be closed automatically whenever the PR is merged and/or an issue/PR is closed as per https://github.com/go-gitea/gitea/pull/4327#issuecomment-401553843 . This PR adds that functionality . This uses `ctx.Flash` to show a one time message that the timer would be closed automatically as per https://github.com/go-gitea/gitea/pull/4327#issuecomment-403326074 <img width="1920" alt="screen shot 2018-07-14 at 17 36 53" src="https://user-images.githubusercontent.com/12677701/42726498-466fd160-878d-11e8-8f68-ab302253511d.png"> --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2025-11-02 12:32:49 -06:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
$20
$250
$50
$500
backport/done
💎 Bounty
docs-update-needed
good first issue
hacktoberfest
issue/bounty
issue/confirmed
issue/critical
issue/duplicate
issue/needs-feedback
issue/not-a-bug
issue/regression
issue/stale
issue/workaround
lgtm/need 2
modifies/api
modifies/translation
outdated/backport/v1.18
outdated/theme/markdown
outdated/theme/timetracker
performance/bigrepo
performance/cpu
performance/memory
performance/speed
pr/breaking
proposal/accepted
proposal/rejected
pr/wip
pull-request
Mirrored from GitHub Pull Request
 reviewed/wontfix
💰 Rewarded
skip-changelog
status/blocked
topic/accessibility
topic/api
topic/authentication
topic/build
topic/code-linting
topic/commit-signing
topic/content-rendering
topic/deployment
topic/distribution
topic/federation
topic/gitea-actions
topic/issues
topic/lfs
topic/mobile
topic/moderation
topic/packages
topic/pr
topic/projects
topic/repo
topic/repo-migration
topic/security
topic/theme
topic/ui
topic/ui-interaction
topic/ux
topic/webhooks
topic/wiki
type/bug
type/deprecation
type/docs
type/enhancement
type/feature
type/miscellaneous
type/proposal
type/question
type/refactoring
type/summary
type/testing
type/upstream
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/gitea#17333
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?