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

Put web editor into a segment #30966

Merged
merged 3 commits into from
May 15, 2024
Merged

Put web editor into a segment #30966

merged 3 commits into from
May 15, 2024

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented May 13, 2024 •
edited

Implement #30707 (comment)

Diff without whitespace: https://github.com/go-gitea/gitea/pull/30966/files?diff=unified&w=1

Screenshot 2024-05-13 at 20 10 07 Screenshot 2024-05-13 at 20 10 14 Screenshot 2024-05-13 at 20 10 22 Screenshot 2024-05-13 at 20 10 43 Screenshot 2024-05-13 at 20 10 49 Screenshot 2024-05-13 at 20 10 55

Might as well backport.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 13, 2024
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 13, 2024
@silverwind silverwind added type/enhancement An improvement of existing functionality backport/v1.22 This PR should be backported to Gitea 1.22 labels May 13, 2024
@github-actions github-actions bot added modifies/templates This PR modifies the template files and removed type/enhancement An improvement of existing functionality backport/v1.22 This PR should be backported to Gitea 1.22 labels May 13, 2024
@silverwind silverwind changed the title Put editor into a segment Put web editor into a segment May 14, 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 May 14, 2024
@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 15, 2024
@jolheiser jolheiser added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 15, 2024
@jolheiser jolheiser enabled auto-merge (squash) May 15, 2024 14:11
@jolheiser jolheiser merged commit ea8e4ba into go-gitea:main May 15, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone May 15, 2024
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 15, 2024
@silverwind silverwind deleted the edseg branch May 15, 2024 16:05
@silverwind silverwind added the backport/v1.22 This PR should be backported to Gitea 1.22 label May 15, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 16, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
4d0309f 
* giteaofficial/main:
  Put web editor into a segment (go-gitea#30966)
  Check if the release is converted from the tag when updating the release (go-gitea#30984)
  Supports forced use of S3 virtual-hosted style (go-gitea#30969)
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request May 16, 2024
@silverwind @GiteaBot
Put web editor into a segment (go-gitea#30966)
dfa82bd 
Implement
go-gitea#30707 (comment)

Diff without whitespace:
https://github.com/go-gitea/gitea/pull/30966/files?diff=unified&w=1

Might as well backport.
@GiteaBot GiteaBot mentioned this pull request May 16, 2024
Merged
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label May 16, 2024
wxiaoguang pushed a commit that referenced this pull request May 16, 2024
@GiteaBot @silverwind
Put web editor into a segment (#30966) (#30993)
3cdf9ed 
Backport #30966 by silverwind

Co-authored-by: silverwind <me@silverwind.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KN4CK3R KN4CK3R KN4CK3R approved these changes

@jolheiser jolheiser jolheiser approved these changes

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@silverwind @KN4CK3R @jolheiser @GiteaBot