Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'internal/gitaly/service/operations/merge.go')
-rw-r--r--internal/gitaly/service/operations/merge.go8
1 files changed, 8 insertions, 0 deletions
diff --git a/internal/gitaly/service/operations/merge.go b/internal/gitaly/service/operations/merge.go
index 8237ec034..d54b7b8d4 100644
--- a/internal/gitaly/service/operations/merge.go
+++ b/internal/gitaly/service/operations/merge.go
@@ -21,6 +21,14 @@ func validateMergeBranchRequest(request *gitalypb.UserMergeBranchRequest) error
return fmt.Errorf("empty user")
}
+ if len(request.User.Email) == 0 {
+ return fmt.Errorf("empty user email")
+ }
+
+ if len(request.User.Name) == 0 {
+ return fmt.Errorf("empty user name")
+ }
+
if len(request.Branch) == 0 {
return fmt.Errorf("empty branch name")
}