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

Restore warning commit status #27504

Merged
merged 6 commits into from
Oct 8, 2023
Merged

Restore warning commit status #27504

merged 6 commits into from
Oct 8, 2023

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented Oct 7, 2023 •
edited
Loading

Partial revert of #25839. This commit status is used by a number of external integrations, so I think we should not remove it (See #25839 (comment)). This is a rare case where an existing migration needed to be alterted to avoid data loss.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 7, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 7, 2023
@silverwind silverwind added the backport/v1.21 This PR should be backported to Gitea 1.21 label Oct 7, 2023
@silverwind silverwind added this to the 1.21.0 milestone Oct 7, 2023
@silverwind silverwind mentioned this pull request Oct 7, 2023
Merged
@yardenshoham
Copy link
Member

Don't forget

gitea/web_src/js/components/DashboardRepoList.vue

Lines 10 to 15 in e3229c8

const commitStatus = {
pending: {name: 'octicon-dot-fill', color: 'yellow'},
success: {name: 'octicon-check', color: 'green'},
error: {name: 'gitea-exclamation', color: 'red'},
failure: {name: 'octicon-x', color: 'red'},
};

@github-actions github-actions bot added the topic/ui Change the appearance of the Gitea UI label Oct 7, 2023
@silverwind
Copy link
Member Author

Don't forget

gitea/web_src/js/components/DashboardRepoList.vue

Lines 10 to 15 in e3229c8

const commitStatus = {
pending: {name: 'octicon-dot-fill', color: 'yellow'},
success: {name: 'octicon-check', color: 'green'},
error: {name: 'gitea-exclamation', color: 'red'},
failure: {name: 'octicon-x', color: 'red'},
};

Done. Interestingly #25839 did not touch this file and blame info is also inconclusive. Maybe it was missing a long time already in the JS.

@yardenshoham
Copy link
Member

It's on #26036

@silverwind
Copy link
Member Author

silverwind commented Oct 7, 2023 •
edited
Loading

Thanks. I also pushed the revert of #26120 which was a followup to #25839.

@silverwind @delvh
Update modules/structs/commit_status.go
8926975 
Co-authored-by: delvh <dev.lh@web.de>
@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 7, 2023
@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 Oct 8, 2023
@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 Oct 8, 2023
@denyskon denyskon added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. giteabot/update-branch Hint for the bot that it should update a PR with the latest state on main and removed topic/ui Change the appearance of the Gitea UI lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. labels Oct 8, 2023
@GiteaBot GiteaBot removed the giteabot/update-branch Hint for the bot that it should update a PR with the latest state on main label Oct 8, 2023
@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 Oct 8, 2023
@denyskon denyskon added the giteabot/update-branch Hint for the bot that it should update a PR with the latest state on main label Oct 8, 2023
@GiteaBot GiteaBot removed the giteabot/update-branch Hint for the bot that it should update a PR with the latest state on main label Oct 8, 2023
@denyskon denyskon added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 8, 2023
@silverwind silverwind enabled auto-merge (squash) October 8, 2023 21:40
@silverwind silverwind merged commit 5bf367f into go-gitea:main Oct 8, 2023
GiteaBot added a commit to GiteaBot/gitea that referenced this pull request Oct 8, 2023
@silverwind @delvh @GiteaBot
Restore warning commit status (go-gitea#27504)
d304272 
Partial revert of go-gitea#25839. This
commit status is used by a number of external integrations, so I think
we should not remove it (See
go-gitea#25839 (comment)).
This is a rare case where an existing migration needed to be alterted to
avoid data loss.

---------

Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: Giteabot <teabot@gitea.io>
@GiteaBot GiteaBot mentioned this pull request Oct 8, 2023
Merged
@GiteaBot GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Oct 8, 2023
@silverwind silverwind deleted the partial-revert-25839 branch October 8, 2023 23:13
silverwind added a commit that referenced this pull request Oct 9, 2023
@GiteaBot @silverwind @delvh
Restore warning commit status (#27504) (#27529)
fb5ae2a 
Backport #27504 by @silverwind

Partial revert of #25839. This
commit status is used by a number of external integrations, so I think
we should not remove it (See
#25839 (comment)).
This is a rare case where an existing migration needed to be alterted to
avoid data loss.

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: delvh <dev.lh@web.de>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Oct 10, 2023
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
087dfb1 
* giteaofficial/main:
  Respect SSH.KeygenPath option when calculating ssh key fingerprints (go-gitea#27536)
  Remove max-width and add hide text overflow (go-gitea#27359)
  Fix `environment-to-ini` inherited key bug (go-gitea#27543)
  Improve docs about register/run as a service (go-gitea#27461)
  api: GetPullRequestCommits: return file list (go-gitea#27483)
  switch to using official AWS step in release nightly (go-gitea#27532)
  Improve file history UI and fix URL escaping bug (go-gitea#27531)
  Improve dropdown's behavior when there is a search input in menu (go-gitea#27526)
  Simplify `contrib/backport` (go-gitea#27520)
  Add docs section for sub-paths with the container registry (go-gitea#27505)
  Document our new labeling strategy (go-gitea#27523)
  [skip ci] Updated translations via Crowdin
  Restore warning commit status (go-gitea#27504)
  Update labeler to match new labeling system (go-gitea#27525)
  Apply to become a maintainer (go-gitea#27522)
  Remove unnecessary desc for openssh key cron task (go-gitea#27515)
  Tweak labeler config (go-gitea#27502)
  Add hover background to wiki list page (go-gitea#27507)
  [FIX] missing ctx in new_form (go-gitea#27514)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jan 7, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny left review comments

@delvh delvh delvh approved these changes

@lafriks lafriks lafriks approved these changes

@denyskon denyskon denyskon approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/migrations size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
1.21.0
Development

Successfully merging this pull request may close these issues.
7 participants
@silverwind @yardenshoham @lunny @lafriks @denyskon @delvh @GiteaBot