fix merge

wxiaoguang · web-flow · commit d41750f51848 · 2025-04-08T13:52:28.000+08:00
diff --git a/services/repository/adopt.go b/services/repository/adopt.go
@@ -103,7 +103,9 @@ func AdoptRepository(ctx context.Context, doer, owner *user_model.User, opts Cre
 	if err = repo_model.UpdateRepositoryCols(ctx, repo, "status"); err != nil {
 		return nil, fmt.Errorf("UpdateRepositoryCols: %w", err)
 	}
+
 	notify_service.AdoptRepository(ctx, doer, owner, repo)
+
 	return repo, nil
 }
 
diff --git a/services/repository/create.go b/services/repository/create.go
@@ -267,7 +267,6 @@ func CreateRepositoryDirectly(ctx context.Context, doer, owner *user_model.User,
 		}
 	}()
 
-
 	// No need for init mirror.
 	if opts.IsMirror {
 		return repo, nil

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,9 @@ func AdoptRepository(ctx context.Context, doer, owner *user_model.User, opts Cre`
`103`	`103`	`if err = repo_model.UpdateRepositoryCols(ctx, repo, "status"); err != nil {`
`104`	`104`	`return nil, fmt.Errorf("UpdateRepositoryCols: %w", err)`
`105`	`105`	`}`
	`106`	`+`
`106`	`107`	`notify_service.AdoptRepository(ctx, doer, owner, repo)`
	`108`	`+`
`107`	`109`	`return repo, nil`
`108`	`110`	`}`
`109`	`111`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,6 @@ func CreateRepositoryDirectly(ctx context.Context, doer, owner *user_model.User,`
`267`	`267`	`}`
`268`	`268`	`}()`
`269`	`269`
`270`		`-`
`271`	`270`	`// No need for init mirror.`
`272`	`271`	`if opts.IsMirror {`
`273`	`272`	`return repo, nil`