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 typescript errors in Vue files, fix regression in "Recent Commits" chart #32649

Merged
merged 17 commits into from
Dec 8, 2024
Merged

Fix typescript errors in Vue files, fix regression in "Recent Commits" chart #32649

merged 17 commits into from
Dec 8, 2024

Conversation

silverwind
Copy link
Member

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 26, 2024
@github-actions github-actions bot added modifies/templates This PR modifies the template files modifies/frontend labels Nov 26, 2024
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 26, 2024
@silverwind silverwind changed the title Fix typescript errors in Vue files Fix typescript errors in Vue files, fix regression in "Recent Commits" chart Nov 26, 2024
@silverwind silverwind mentioned this pull request Nov 26, 2024
Merged
16 tasks
wxiaoguang
wxiaoguang reviewed Nov 26, 2024
View reviewed changes
web_src/js/data.ts Outdated Show resolved Hide resolved
wxiaoguang
wxiaoguang reviewed Nov 26, 2024
View reviewed changes
web_src/js/globals.d.ts Outdated Show resolved Hide resolved
wxiaoguang
wxiaoguang reviewed Nov 26, 2024
View reviewed changes
web_src/js/types.ts Outdated Show resolved Hide resolved
delvh
delvh reviewed Nov 26, 2024
View reviewed changes
web_src/js/globals.d.ts Outdated Show resolved Hide resolved
web_src/js/components/RepoContributors.vue Show resolved Hide resolved
@silverwind @wxiaoguang
Update templates/repo/commit_status.tmpl
fcc3fb4 
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@silverwind silverwind marked this pull request as draft December 5, 2024 11:07
@silverwind
Copy link
Member Author

Will pick this up again in a few days.

@wxiaoguang
Merge branch 'main' into types-7
189722b 
# Conflicts:
#	web_src/js/components/RepoActionView.vue
#	web_src/js/types.ts
@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 7, 2024
@github-actions github-actions bot removed the modifies/templates This PR modifies the template files label Dec 7, 2024
@wxiaoguang
Copy link
Contributor

wxiaoguang commented Dec 7, 2024 •
edited
Loading

I managed to merge from main branch (189722b) to resolve the conflicts caused by my PRs.

# Conflicts:
#	web_src/js/components/RepoActionView.vue
#	web_src/js/types.ts

By the way, the merge also resolves some reviews above:

  • the CommitStatus is only used in one Vue file, so if it would be used at more places, we could move and export it then
  • _jobLogTime: not needed anymore
  • ActionsStepLogLine: removed, it is in RepoActionView privately

@wxiaoguang wxiaoguang added this to the 1.23.0 milestone Dec 7, 2024
@wxiaoguang
Copy link
Contributor

And since it contains a bug fix, add the 1.23 milestone

silverwind
silverwind commented Dec 7, 2024
View reviewed changes
tsconfig.json Outdated Show resolved Hide resolved
@silverwind silverwind marked this pull request as ready for review December 7, 2024 08:14
@silverwind
Copy link
Member Author

Thanks, looking good. This is ready.

wxiaoguang
wxiaoguang approved these changes Dec 7, 2024
View reviewed changes
Copy link
Contributor

@wxiaoguang wxiaoguang left a comment

Choose a reason for hiding this comment

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

Thank you for confirming, then LGTM

@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 Dec 7, 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 Dec 8, 2024
@wxiaoguang wxiaoguang enabled auto-merge (squash) December 8, 2024 02:32
@wxiaoguang wxiaoguang added skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Dec 8, 2024
@wxiaoguang wxiaoguang merged commit 1518f4e into go-gitea:main Dec 8, 2024
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 8, 2024
@silverwind silverwind deleted the types-7 branch December 8, 2024 07:24
zjjhot added a commit to zjjhot/gitea that referenced this pull request Dec 9, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
24b0634 
* giteaofficial/main:
  [skip ci] Updated licenses and gitignores
  Fix repo home row-right grow (go-gitea#32763)
  Refactor issue list (go-gitea#32755)
  Fix compare page bug view as anonymous (go-gitea#32754)
  Split issue/pull view router function as multiple smaller functions (go-gitea#32749)
  fix: render job title as commit message (go-gitea#32748)
  Fix typescript errors in Vue files, fix regression in "Recent Commits" chart (go-gitea#32649)
  Refactor LabelEdit (go-gitea#32752)
  [skip ci] Updated translations via Crowdin
  fix(project): add title to project view page (go-gitea#32747)
  [skip ci] Updated translations via Crowdin
  Fix case of .tsbuildinfo in .gitignore (go-gitea#32737)
  Support "merge upstream branch" (Sync fork) (go-gitea#32741)
  Update changelog to add missed changelog (go-gitea#32734)
  GitHub like repo home page (go-gitea#32213)
  Refactor markdown render (go-gitea#32736)
  Make wiki pages visit fast (go-gitea#32732)
  Refactor markdown render (go-gitea#32728)
  Refactor RepoActionView.vue, add `::group::` support (go-gitea#32713)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@delvh delvh delvh left review comments

@wxiaoguang wxiaoguang wxiaoguang approved these changes

@lunny lunny lunny 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/frontend size/M Denotes a PR that changes 30-99 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
Projects
None yet
Milestone
1.23.0
Development

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