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

bump bleve #27300

Merged
merged 5 commits into from
Sep 27, 2023
Merged

bump bleve #27300

merged 5 commits into from
Sep 27, 2023

Conversation

techknowlogick
Copy link
Member

No description provided.

@techknowlogick techknowlogick added type/bug dependencies backport/v1.21 This PR should be backported to Gitea 1.21 labels Sep 27, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 27, 2023
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 27, 2023
@techknowlogick techknowlogick added the backport/v1.20 This PR should be backported to Gitea 1.20 label Sep 27, 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 Sep 27, 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 Sep 27, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 27, 2023
@github-actions github-actions bot added topic/ui Change the appearance of the Gitea UI topic/code-linting and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Sep 27, 2023
@lunny lunny enabled auto-merge (squash) September 27, 2023 05:21
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 27, 2023
@GiteaBot
Copy link
Contributor

@techknowlogick please fix the merge conflicts. 🍵

@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 27, 2023
@github-actions github-actions bot removed topic/ui Change the appearance of the Gitea UI topic/code-linting labels Sep 27, 2023
@lunny lunny merged commit 9e446db into go-gitea:main Sep 27, 2023
25 checks passed
@GiteaBot GiteaBot added this to the 1.22.0 milestone Sep 27, 2023
@GiteaBot
Copy link
Contributor

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

go run ./contrib/backport 27300
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Sep 27, 2023
@GiteaBot GiteaBot mentioned this pull request Sep 27, 2023
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Sep 27, 2023
Co-authored-by: yp05327 <576951401@qq.com>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
lunny added a commit that referenced this pull request Sep 27, 2023
Backport #27300 by @techknowlogick

Co-authored-by: techknowlogick <techknowlogick@gitea.com>
Co-authored-by: yp05327 <576951401@qq.com>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
@techknowlogick techknowlogick deleted the some-new-branch-name branch September 27, 2023 12:41
zjjhot added a commit to zjjhot/gitea that referenced this pull request Sep 28, 2023
* giteaoffical/main: (22 commits)
  Fix review UI (go-gitea#27322)
  Improve issue history dialog and make poster can delete their own history (go-gitea#27323)
  Improve branch list UI (go-gitea#27319)
  doctor: delete action entries without existing user (go-gitea#27292)
  fix orphan check for deleted branch (go-gitea#27310)
  make writing main test easier (go-gitea#27270)
  [skip ci] Updated translations via Crowdin
  Fix protected branch icon location (go-gitea#26576)
  move the `gitea admin` subcommands into separate files (go-gitea#27307)
  Fix chinese translation (go-gitea#27296)
  bump bleve (go-gitea#27300)
  Redefine the meaning of column is_active to make Actions Registration Token generation easier (go-gitea#27143)
  Use vitest globals (go-gitea#27102)
  Fix divider in subscription page (go-gitea#27298)
  Fix yaml test (go-gitea#27297)
  Enable production source maps for index.js, fix CSS sourcemaps (go-gitea#27291)
  Fix some animation bugs (go-gitea#27287)
  Add missed return to actions view fetch (go-gitea#27289)
  Fix more yaml lint errors (go-gitea#27284)
  Fix incorrect change from go-gitea#27231 (go-gitea#27275)
  ...
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Dec 26, 2023
@lunny lunny added the backport/done All backports for this PR have been created label Feb 22, 2024
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 backport/manual No power to the bots! Create your backport yourself! backport/v1.20 This PR should be backported to Gitea 1.20 backport/v1.21 This PR should be backported to Gitea 1.21 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. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants