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

Improve pull request merge box when pull request merged and branch deleted. #24397

Merged
merged 10 commits into from
May 3, 2023
Merged

Improve pull request merge box when pull request merged and branch deleted. #24397

merged 10 commits into from
May 3, 2023

Conversation

lunny
Copy link
Member

@lunny lunny commented Apr 28, 2023 •
edited
Loading

This PR hide the pull request merge box totally if it's merged and branch deleted.

It's also add a bold for merge base commit id in merged message comment

Before:

图片

After:

图片

@lunny lunny added type/bug skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Apr 28, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 28, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 28, 2023
@lunny lunny requested a review from silverwind April 28, 2023 06:03
@silverwind
Copy link
Member

Why introduce the duplicate hash again in the message? It is visible in the timeline entry above, isn't it?

@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 Apr 28, 2023
@lunny lunny changed the title Fix wrong delete branch text Improve pull request merge box when pull request merged and branch deleted. Apr 28, 2023
@lunny
Copy link
Member Author

lunny commented Apr 28, 2023

Why introduce the duplicate hash again in the message? It is visible in the timeline entry above, isn't it?

Reasonable. I have adjusted the pull request.

@lunny lunny added this to the 1.20.0 milestone Apr 28, 2023
@lunny lunny added type/enhancement An improvement of existing functionality topic/ui Change the appearance of the Gitea UI and removed type/bug labels Apr 28, 2023
@silverwind
Copy link
Member

silverwind commented Apr 28, 2023 •
edited
Loading

Thanks. BTW, Is it possible to inject <script>alert('xss')</script> via translation string or is there sanitization to prevent this? It's not a new issues but I suspect all translations may be vulnerable to attacks like this. Of course, given Crowdin's review process, something like this is unlikely to pass review, but it's good to have defense in depth.

@lunny lunny mentioned this pull request Apr 28, 2023
Open
silverwind
silverwind approved these changes Apr 28, 2023
View reviewed changes
Copy link
Member

@silverwind silverwind left a comment

Choose a reason for hiding this comment

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

LGTM after request above.

@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 28, 2023
@silverwind silverwind mentioned this pull request Apr 28, 2023
Merged
@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 May 2, 2023
@lunny @wxiaoguang
Update templates/repo/issue/view_content/pull.tmpl
4a3ef4f 
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 3, 2023
@lunny lunny merged commit e9b3925 into go-gitea:main May 3, 2023
@lunny lunny deleted the lunny/fix_delete_branch_text branch May 3, 2023 13:52
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 3, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 4, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
5c32bab 
* upstream/main: (65 commits)
  Changelog for 1.19.3 (go-gitea#24495) (go-gitea#24506)
  Use Actions for DB & E2E tests (go-gitea#24494)
  Fix intermittent CI failure in EmptyQueue (go-gitea#23753)
  Prevent a user with a different email from accepting the team invite (go-gitea#24491)
  Fix incorrect webhook time and use relative-time to display it (go-gitea#24477)
  Make Issue/PR/projects more compact, misc CSS tweaks (go-gitea#24459)
  Implement Cargo HTTP index (go-gitea#24452)
  Clean up polluted styles and remove dead CSS code (go-gitea#24497)
  Improve pull request merge box when pull request merged and branch deleted. (go-gitea#24397)
  Fix EasyMDE toolbar (go-gitea#24489)
  Enhance stylelint rule config, remove dead CSS (go-gitea#24472)
  Fix api error message if fork exists (go-gitea#24487)
  Add ntlm authentication support for mail (go-gitea#23811)
  Fix test delivery button in repo webhook settings page (go-gitea#24478)
  Add Debian package registry (go-gitea#24426)
  Enable whitespace rendering on selection in Monaco (go-gitea#24444)
  Replace `N/A` with `-` everywhere (go-gitea#24474)
  Fix invite display (go-gitea#24447)
  [skip ci] Updated translations via Crowdin
  replace PR docker dry run in drone with Actions (go-gitea#24475)
  ...

# Conflicts:
#	templates/base/footer_content.tmpl
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 1, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@silverwind silverwind silverwind approved these changes

@wxiaoguang wxiaoguang wxiaoguang 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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. 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/enhancement An improvement of existing functionality
Projects
None yet
Milestone
1.20.0
Development

Successfully merging this pull request may close these issues.
4 participants
@lunny @silverwind @wxiaoguang @GiteaBot