commit e1b79ac4b99b91492bc4b397d881937708549b18 · veryroundbird.house/core

+2 -2

knotserver/config/config.go

···

       29
        
       

     

       30
        
       type Git struct {

     

       31
        
       	// user name & email used as committer

     

       32
       -
       	UserName     string `env:"USER_NAME, default=Tangled"`

     

       33
       -
       	UserEmail    string `env:"USER_EMAIL, default=noreply@tangled.sh"`

     

       34
        
       }

     

       35
        
       

     

       36
        
       func (s Server) Did() syntax.DID {

···

       29
        
       

     

       30
        
       type Git struct {

     

       31
        
       	// user name & email used as committer

     

       32
       +
       	UserName  string `env:"USER_NAME, default=Tangled"`

     

       33
       +
       	UserEmail string `env:"USER_EMAIL, default=noreply@tangled.sh"`

     

       34
        
       }

     

       35
        
       

     

       36
        
       func (s Server) Did() syntax.DID {

+1 -1

knotserver/xrpc/merge.go

···

       81
        
       		mo.CommitMessage = *data.CommitMessage

     

       82
        
       	}

     

       83
        
       

     

       84
       -
       	mo.CommitterName =  x.Config.Git.UserName

     

       85
        
       	mo.CommitterEmail = x.Config.Git.UserEmail

     

       86
        
       	mo.FormatPatch = patchutil.IsFormatPatch(data.Patch)

     

       87

···

       81
        
       		mo.CommitMessage = *data.CommitMessage

     

       82
        
       	}

     

       83
        
       

     

       84
       +
       	mo.CommitterName = x.Config.Git.UserName

     

       85
        
       	mo.CommitterEmail = x.Config.Git.UserEmail

     

       86
        
       	mo.FormatPatch = patchutil.IsFormatPatch(data.Patch)

     

       87