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

Fix loading spinner on ContextPopup #30145

Merged
merged 2 commits into from
Mar 27, 2024
Merged

Fix loading spinner on ContextPopup #30145

merged 2 commits into from
Mar 27, 2024

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented Mar 27, 2024 •
edited
Loading

Fix regression from #26670. Here with simulated delay:

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 27, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 27, 2024
@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 Mar 27, 2024
@kdumontnu kdumontnu added the backport/v1.21 This PR should be backported to Gitea 1.21 label Mar 27, 2024
kdumontnu
kdumontnu approved these changes Mar 27, 2024
View reviewed changes
Copy link
Contributor

@kdumontnu kdumontnu left a comment

Choose a reason for hiding this comment

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

💯

@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 27, 2024
@silverwind
Copy link
Member Author

silverwind commented Mar 27, 2024 •
edited
Loading

Not easily backportable because of tailwind use and I think it's not critical enough either for me to bother, but if someone wants, they can backport with some CSS in place of tailwind.

@silverwind silverwind added reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. and removed backport/v1.21 This PR should be backported to Gitea 1.21 labels Mar 27, 2024
@silverwind silverwind enabled auto-merge (squash) March 27, 2024 20:12
@silverwind silverwind merged commit 4eb86d6 into go-gitea:main Mar 27, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Mar 27, 2024
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 27, 2024
@kdumontnu
Copy link
Contributor

Not easily backportable because of tailwind use and I think it's not critical enough either for me to bother, but if someone wants, they can backport with some CSS in place of tailwind.

tw-* should be supported in v1.21. I just tested this change on 1.21 and it fixed the issue.

Perhaps I'm missing something.

@silverwind
Copy link
Member Author

It couldn't work because #29357 is only on 1.22 branch.

@silverwind silverwind deleted the cspin branch March 27, 2024 20:42
@kdumontnu
Copy link
Contributor

It couldn't work because #29357 is only on 1.22 branch.

Ah, didn't realize that was post-1.21 branch & I had cherry-picked independently on my fork. Thanks!

silverwind added a commit to silverwind/gitea that referenced this pull request Mar 27, 2024
@silverwind
Merge remote-tracking branch 'origin/main' into drag
1e3f79a 
* origin/main: (108 commits)
  Fix table alignment classes (go-gitea#30144)
  Add default board to new projects, remove uncategorized pseudo-board (go-gitea#29874)
  Fix loading spinner on ContextPopup (go-gitea#30145)
  Fix download buttons on branches page (go-gitea#30147)
  Relax generic package filename restrictions (go-gitea#30135)
  Remove jQuery class from the common admin functions (go-gitea#30137)
  Remove jQuery class from the reaction selector (go-gitea#30138)
  Forbid jQuery `.attr` (go-gitea#30116)
  Refactor render (go-gitea#30136)
  Fix: Organization Interface Display Issue (go-gitea#30133)
  Remove jQuery `.attr` from the Fomantic dropdowns (go-gitea#30114)
  Remove jQuery `.attr` from the common admin functions (go-gitea#30115)
  Remove jQuery from the create/rename branch modals (except Fomantic) (go-gitea#30109)
  Remove fomantic label module (go-gitea#30081)
  Fix bug for markdown rendering of blockquote (go-gitea#30130)
  Fix: The interface is broken when modifying  code comments under mobile devices  (go-gitea#30125)
  When the title in the issue has a value, set the text cursor at the end of the text. (go-gitea#30090)
  Load attachments for code comments (go-gitea#30124)
  Upgrade fabric to 6.0.0-beta20 (go-gitea#30121)
  Fix click handler in job-step-summary (go-gitea#30122)
  ...
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 28, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
fe778b8 
* giteaofficial/main: (63 commits)
  Apply to become a maintainer (go-gitea#30151)
  Refactor markdown render (go-gitea#30139)
  Drag-and-drop improvements for projects and issue pins (go-gitea#29875)
  Fix table alignment classes (go-gitea#30144)
  Add default board to new projects, remove uncategorized pseudo-board (go-gitea#29874)
  Fix loading spinner on ContextPopup (go-gitea#30145)
  Fix download buttons on branches page (go-gitea#30147)
  Relax generic package filename restrictions (go-gitea#30135)
  Remove jQuery class from the common admin functions (go-gitea#30137)
  Remove jQuery class from the reaction selector (go-gitea#30138)
  Forbid jQuery `.attr` (go-gitea#30116)
  Refactor render (go-gitea#30136)
  Fix: Organization Interface Display Issue (go-gitea#30133)
  Remove jQuery `.attr` from the Fomantic dropdowns (go-gitea#30114)
  Remove jQuery `.attr` from the common admin functions (go-gitea#30115)
  Remove jQuery from the create/rename branch modals (except Fomantic) (go-gitea#30109)
  Remove fomantic label module (go-gitea#30081)
  Fix bug for markdown rendering of blockquote (go-gitea#30130)
  Fix: The interface is broken when modifying  code comments under mobile devices  (go-gitea#30125)
  When the title in the issue has a value, set the text cursor at the end of the text. (go-gitea#30090)
  ...

# Conflicts:
#	templates/user/dashboard/issues.tmpl
@techknowlogick techknowlogick modified the milestones: 1.23.0, 1.22.0 Mar 28, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jun 26, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@delvh delvh delvh approved these changes

@kdumontnu kdumontnu kdumontnu 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. modifies/js size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.
5 participants
@silverwind @kdumontnu @delvh @techknowlogick @GiteaBot