Skip to content

Add tracked time fix to doctor (part of #11111)#11138

Merged
zeripath merged 10 commits into
go-gitea:release/v1.11from
6543-forks:backport_tracked-time-fix
May 29, 2020
Merged

Add tracked time fix to doctor (part of #11111)#11138
zeripath merged 10 commits into
go-gitea:release/v1.11from
6543-forks:backport_tracked-time-fix

Conversation

@6543
Copy link
Copy Markdown
Member

@6543 6543 commented Apr 19, 2020 •
edited by zeripath
Loading

Backports the tracked-time fix from #11111 (part of #11111)

Fixes tracked time errors following repo deletion (#10280) and adds the fix to the default doctor tasks !

6543
6543 commented Apr 19, 2020
View reviewed changes
Comment thread cmd/doctor.go Outdated
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 19, 2020
@6543 6543 mentioned this pull request Apr 19, 2020
Merged
@zeripath zeripath added this to the 1.11.5 milestone Apr 19, 2020
@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 Apr 19, 2020
guillep2k
guillep2k approved these changes Apr 21, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@guillep2k guillep2k left a comment

Choose a reason for hiding this comment

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

For consistency, I'd rather front-port this PR and work #11111 from there.

@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 Apr 21, 2020
@zeripath zeripath added the status/blocked This PR cannot be merged yet, i.e. because it depends on another unmerged PR label Apr 21, 2020
zeripath
zeripath suggested changes Apr 21, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@zeripath zeripath left a comment

Choose a reason for hiding this comment

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

Blocked until #11111 is merged

@lunny lunny modified the milestones: 1.11.5, 1.11.6 May 7, 2020
@6543
Copy link
Copy Markdown
Member Author

6543 commented May 18, 2020

since doctor got released this is now kind/breaking !

@lafriks
Copy link
Copy Markdown
Member

lafriks commented May 20, 2020

Released in what version?

@6543
Copy link
Copy Markdown
Member Author

6543 commented May 20, 2020

1.11 since doctor got backported by @zeripath

@zeripath
Copy link
Copy Markdown
Contributor

zeripath commented May 29, 2020

Do we still want this backported to 1.11.6? my suspicion is not but I guess it might be helpful?

@6543
Copy link
Copy Markdown
Member Author

6543 commented May 29, 2020

@zeripath I would partialy backport it to fix an issue described in #10280

I would leave this implementation as it is now and the comand wont change from there on only get more functions&checks :)

@6543

This comment has been minimized.

Sign in to view
@zeripath zeripath removed the status/blocked This PR cannot be merged yet, i.e. because it depends on another unmerged PR label May 29, 2020
@zeripath zeripath changed the title [Partial Backport] add tracked time fix to doctor (part of #11111) Add tracked time fix to doctor (part of #11111) May 29, 2020
@zeripath
Copy link
Copy Markdown
Contributor

zeripath commented May 29, 2020

make lg-tm work

@zeripath zeripath merged commit 801f4b9 into go-gitea:release/v1.11 May 29, 2020
@lafriks lafriks deleted the backport_tracked-time-fix branch May 29, 2020 15:43
@guillep2k guillep2k mentioned this pull request May 30, 2020
Merged
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@lafriks lafriks lafriks approved these changes

+2 more reviewers

@zeripath zeripath zeripath approved these changes

@guillep2k guillep2k guillep2k approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug

Projects

None yet

Milestone

1.11.6

Development

Successfully merging this pull request may close these issues.

6 participants

@6543 @lafriks @zeripath @guillep2k @lunny @GiteaBot