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.

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

Fix JS error on compare page #23551

Merged
merged 4 commits into from
Mar 18, 2023
Merged

Fix JS error on compare page #23551

merged 4 commits into from
Mar 18, 2023

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented Mar 17, 2023

Fix regression from #23271. This code apparently runs on the compare page where there is no review button so check for existance of both button and content.

Screenshot 2023-03-17 at 21 42 47

Fixes #23562

@silverwind silverwind added type/bug topic/ui Change the appearance of the Gitea UI outdated/backport/v1.19 This PR should be backported to Gitea 1.19 labels Mar 17, 2023
@silverwind silverwind added this to the 1.20.0 milestone Mar 17, 2023
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Mar 17, 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 Mar 18, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 18, 2023
@silverwind silverwind modified the milestones: 1.20.0, 1.19.0 Mar 18, 2023
@silverwind
Copy link
Member Author

Also moving this to 1.19.0 as it is a critical regression and the backport of this should go in before release.

@delvh delvh added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Mar 18, 2023
@delvh delvh modified the milestones: 1.19.0, 1.20.0 Mar 18, 2023
@delvh
Copy link
Member

delvh commented Mar 18, 2023

See #23554 (comment)

@delvh delvh added the reviewed/prioritize-merge PR is in the merge queue. Merge as soon as possible, i.e. as edits by maintainers are not enabled label Mar 18, 2023
@delvh delvh enabled auto-merge (squash) March 18, 2023 20:44
@delvh
Copy link
Member

delvh commented Mar 18, 2023

🎺 🤖

@delvh delvh merged commit 53b609e into go-gitea:main Mar 18, 2023
@delvh delvh removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. reviewed/prioritize-merge PR is in the merge queue. Merge as soon as possible, i.e. as edits by maintainers are not enabled labels Mar 18, 2023
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Mar 18, 2023
Fix regression from go-gitea#23271.
This code apparently runs on the compare page where there is no review button so check for existance of both button and content.

<img width="1226" alt="Screenshot 2023-03-17 at 21 42 47"
src="https://user-images.githubusercontent.com/115237/226040001-ec097edd-d926-4c80-9962-526f9b7eff19.png">

Fixes go-gitea#23562
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Mar 18, 2023
@silverwind silverwind deleted the compare-err branch March 18, 2023 21:13
jolheiser pushed a commit that referenced this pull request Mar 18, 2023
Backport #23551 by @silverwind

Fix regression from #23271. This
code apparently runs on the compare page where there is no review button
so check for existance of both button and content.

<img width="1226" alt="Screenshot 2023-03-17 at 21 42 47"
src="https://user-images.githubusercontent.com/115237/226040001-ec097edd-d926-4c80-9962-526f9b7eff19.png">

Fixes #23562

Co-authored-by: silverwind <[email protected]>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 20, 2023
* giteaofficial/main: (23 commits)
  Display the version of runner in the runner list (go-gitea#23490)
  Add `.patch` to `attachment.ALLOWED_TYPES` (go-gitea#23580)
  Sort Python package descriptors by version to mimic PyPI format (go-gitea#23550)
  Use `project.IconName` instead of repeated unreadable `if-else` chains (go-gitea#23538)
  Match api migration behavior to web behavior (go-gitea#23552)
  Fix dropdown icon misalignment when using fomantic icon (go-gitea#23558)
  Enable color for consistency checks diffs (go-gitea#23563)
  [skip ci] Updated translations via Crowdin
  Fix sticky header in diff view (go-gitea#23554)
  Fix some broken css (go-gitea#23560)
  Fix JS error on compare page (go-gitea#23551)
  Upgrade to npm lockfile v3 and explicitely set it (go-gitea#23561)
  Fix long name ui issues and label ui issue  (go-gitea#23541)
  Remove worker-loader (go-gitea#23548)
  [skip ci] Updated translations via Crowdin
  Return `repository` in npm package metadata endpoint (go-gitea#23539)
  Fix diff detail buttons wrapping, use tippy for review box (go-gitea#23271)
  Do not store user projects as organization projects (go-gitea#23353)
  Imrove scroll behavior to hash issuecomment(scroll position, auto expand if file is folded, and on refreshing) (go-gitea#23513)
  Increase horizontal page padding (go-gitea#23507)
  ...
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. outdated/backport/v1.19 This PR should be backported to Gitea 1.19 skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. topic/ui Change the appearance of the Gitea UI type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unable to create a pull request in try.gitea.io
6 participants