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 invite display #24447

Merged
merged 4 commits into from
May 2, 2023
Merged

Fix invite display #24447

merged 4 commits into from
May 2, 2023

Conversation

KN4CK3R
Copy link
Member

@KN4CK3R KN4CK3R commented Apr 30, 2023

Regression of #23901

Before
grafik

After
grafik

@KN4CK3R KN4CK3R added type/bug outdated/backport/v1.19 This PR should be backported to Gitea 1.19 labels Apr 30, 2023
@KN4CK3R KN4CK3R added this to the 1.20.0 milestone Apr 30, 2023
@KN4CK3R KN4CK3R requested a review from silverwind April 30, 2023 18:58
@GiteaBot GiteaBot added lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 30, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 30, 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 Apr 30, 2023
@wxiaoguang
Copy link
Contributor

wxiaoguang commented May 1, 2023

Which page? It's related to "float-right". I think we should fix it as "right" hmm, saw it.

@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 1, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 2, 2023
@silverwind silverwind merged commit df00cca into go-gitea:main May 2, 2023
1 check passed
@GiteaBot
Copy link
Contributor

GiteaBot commented May 2, 2023

I was unable to create a backport for 1.19. @KN4CK3R, please send one manually. 🍵

@GiteaBot GiteaBot added backport/manual No power to the bots! Create your backport yourself! and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels May 2, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 4, 2023
* 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
@KN4CK3R KN4CK3R deleted the fix-invite branch May 8, 2023 11:54
@lunny lunny removed the outdated/backport/v1.19 This PR should be backported to Gitea 1.19 label Jul 26, 2023
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 31, 2023
@GiteaBot
Copy link
Contributor

We lock pull requests 3 months after they were closed. If there's any need for further discussion, please open a new issue. 🍵

@yardenshoham yardenshoham removed the backport/manual No power to the bots! Create your backport yourself! label Jul 31, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants