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

Update JS dependencies, remove space after emoji completion #25266

Merged
merged 9 commits into from
Jun 18, 2023

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented Jun 14, 2023

To explain the text-expander-element change: Before this version, the element added a unavoidable space after emoji completion. Now that github/text-expander-element#36 is in, we gain control over this space and I opted to remove it for emoji completion and retain it for @ mentions.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 14, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 14, 2023
@silverwind silverwind added dependencies backport/v1.20 This PR should be backported to Gitea 1.20 labels Jun 14, 2023
@silverwind silverwind changed the title Update JS dependencies Update JS dependencies, remove whitespace after emoji completion Jun 14, 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 Jun 14, 2023
@silverwind silverwind changed the title Update JS dependencies, remove whitespace after emoji completion Update JS dependencies, remove space after emoji completion Jun 15, 2023
@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 Jun 18, 2023
@silverwind
Copy link
Member Author

Dependencies updated again, new octicons added, new stylelint rule added.

@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 Jun 18, 2023
@techknowlogick techknowlogick enabled auto-merge (squash) June 18, 2023 04:00
@techknowlogick techknowlogick added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 18, 2023
@GiteaBot
Copy link
Contributor

@silverwind 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 Jun 18, 2023
* main:
  build nightly docker images (go-gitea#25317)
  Add `stylelint-declaration-block-no-ignored-properties` (go-gitea#25284)
@silverwind silverwind added reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Jun 18, 2023
@silverwind silverwind disabled auto-merge June 18, 2023 07:50
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 18, 2023
@silverwind silverwind enabled auto-merge (squash) June 18, 2023 07:53
@silverwind silverwind merged commit f47744c into go-gitea:main Jun 18, 2023
@GiteaBot GiteaBot added this to the 1.21.0 milestone Jun 18, 2023
@GiteaBot
Copy link
Contributor

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

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

@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 Jun 18, 2023
@silverwind silverwind deleted the deps-55 branch June 18, 2023 15:25
silverwind added a commit to silverwind/gitea that referenced this pull request Jun 18, 2023
…#25266)

- Update all JS dependencies
- Enable stylint
[`media-feature-name-value-no-unknown`](https://stylelint.io/user-guide/rules/media-feature-name-value-no-unknown)
- Make use of new features in webpack and text-expander-element
- Tested Swagger and Mermaid

To explain the `text-expander-element` change: Before this version, the
element added a unavoidable space after emoji completion. Now that
github/text-expander-element#36 is in, we gain
control over this space and I opted to remove it for emoji completion
and retain it for `@` mentions.

---------

Co-authored-by: Giteabot <teabot@gitea.io>
@yardenshoham yardenshoham added the backport/done All backports for this PR have been created label Jun 18, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jun 19, 2023
* giteaofficial/main: (22 commits)
  Only run `docker-dryrun` when necessary (go-gitea#25329)
  fix a nit error output in Makefile (go-gitea#25360)
  [skip ci] Updated translations via Crowdin
  Clean up pyproject.toml and package.json, fix poetry options (go-gitea#25327)
  Fix label list divider (go-gitea#25312)
  Avoid polluting the config (go-gitea#25345)
  Fix incorrect link-action event target (go-gitea#25306)
  Write absolute AppDataPath to app.ini when installing (go-gitea#25331)
  Add Exoscale to installation on cloud provider docs (go-gitea#25342)
  Fix UI on mobile view (go-gitea#25315)
  When viewing a file, hide the add button (go-gitea#25320)
  Update JS dependencies, remove space after emoji completion (go-gitea#25266)
  Refactor web package and context package (go-gitea#25298)
  build nightly docker images (go-gitea#25317)
  Add `stylelint-declaration-block-no-ignored-properties` (go-gitea#25284)
  Remove EasyMDE focus outline on text (go-gitea#25328)
  use Actions environment variables in Makefile (go-gitea#25319)
  add `stylelint-stylistic` (go-gitea#25285)
  Remove more unused Fomantic variants (go-gitea#25292)
  Build nightly binaries with Actions (go-gitea#25308)
  ...
silverwind added a commit that referenced this pull request Jun 20, 2023
…25352)

Manual backport of #25266 because of lockfile conflicts.

- Update all JS dependencies
- Enable stylint
[`media-feature-name-value-no-unknown`](https://stylelint.io/user-guide/rules/media-feature-name-value-no-unknown)
- Make use of new features in webpack and text-expander-element
- Tested Swagger and Mermaid

To explain the `text-expander-element` change: Before this version, the
element added a unavoidable space after emoji completion. Now that
github/text-expander-element#36 is in, we gain
control over this space and I opted to remove it for emoji completion
and retain it for `@` mentions.

Co-authored-by: Giteabot <teabot@gitea.io>
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 16, 2023
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 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants