@@ -1324,7 +1324,6 @@ func createRepository(e *xorm.Session, doer, u *User, repo *Repository) (err err
13241324 }); err != nil {
13251325 return fmt .Errorf ("prepareWebhooks: %v" , err )
13261326 }
1327- go HookQueue .Add (repo .ID )
13281327 } else if err = repo .recalculateAccesses (e ); err != nil {
13291328 // Organization automatically called this in addRepository method.
13301329 return fmt .Errorf ("recalculateAccesses: %v" , err )
@@ -1393,7 +1392,16 @@ func CreateRepository(doer, u *User, opts CreateRepoOptions) (_ *Repository, err
13931392 }
13941393 }
13951394
1396- return repo , sess .Commit ()
1395+ if err = sess .Commit (); err != nil {
1396+ return nil , err
1397+ }
1398+
1399+ // Add to hook queue for created repo after session commit.
1400+ if u .IsOrganization () {
1401+ go HookQueue .Add (repo .ID )
1402+ }
1403+
1404+ return repo , err
13971405}
13981406
13991407func countRepositories (userID int64 , private bool ) int64 {
@@ -2478,6 +2486,11 @@ func ForkRepository(doer, u *User, oldRepo *Repository, name, desc string) (_ *R
24782486 go HookQueue .Add (oldRepo .ID )
24792487 }
24802488
2489+ // Add to hook queue for created repo after session commit.
2490+ if u .IsOrganization () {
2491+ go HookQueue .Add (repo .ID )
2492+ }
2493+
24812494 if err = repo .UpdateSize (); err != nil {
24822495 log .Error ("Failed to update size for repository: %v" , err )
24832496 }
0 commit comments