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

Add IsErrRepoFilesAlreadyExist check when fork repo #24678

Merged
merged 6 commits into from
May 22, 2023
Merged

Add IsErrRepoFilesAlreadyExist check when fork repo #24678

merged 6 commits into from
May 22, 2023

Conversation

yp05327
Copy link
Contributor

@yp05327 yp05327 commented May 12, 2023

Before:
image
After:
image

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 12, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label May 12, 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 May 12, 2023
delvh
delvh reviewed May 12, 2023
View reviewed changes
routers/api/v1/repo/fork.go Outdated Show resolved Hide resolved
@yp05327 yp05327 changed the title [WIP] Add IsErrRepoFilesAlreadyExist check when fork repo Add IsErrRepoFilesAlreadyExist check when fork repo May 22, 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 May 22, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 22, 2023
@lunny lunny merged commit bebc343 into go-gitea:main May 22, 2023
15 checks passed
@GiteaBot GiteaBot added this to the 1.20.0 milestone May 22, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 22, 2023
@yp05327 yp05327 deleted the add-IsErrRepoFilesAlreadyExist-check-to-fork-repo branch May 22, 2023 23:55
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 23, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
f0522e1 
* upstream/main:
  Fix install page context, make the install page tests really test (go-gitea#24858)
  Add validations.required check to dropdown field (go-gitea#24849)
  Use Go 1.20 for next release (go-gitea#24859)
  Add gitea manager reload-templates command (go-gitea#24843)
  Remove `In your repositories` link in milestones dashboard (go-gitea#24853)
  Fix 500 error when select `No assignee` filter in issue list page (go-gitea#24854)
  Add IsErrRepoFilesAlreadyExist check when fork repo (go-gitea#24678)
  Fix missing yes/no in delete time log modal (go-gitea#24851)
  Fix document and improve comment (go-gitea#24844)

# Conflicts:
#	web_src/css/base.css
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 20, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@delvh delvh delvh left review comments

@lunny lunny lunny approved these changes

@silverwind silverwind silverwind 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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
1.20.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@yp05327 @lunny @silverwind @delvh @GiteaBot