Skip to content

Allow GitLab EasyCLA status comment on MRs from forked repos #5053

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

Merged
lukaszgryglicki merged 1 commit into from
May 14, 2026
+8 −6
Merged

Allow GitLab EasyCLA status comment on MRs from forked repos #5053

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions cla-backend-go/v2/gitlab-activity/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,11 +280,15 @@ func (s *service) ProcessMergeActivity(ctx context.Context, secretToken string,

signURL := GetFullSignURL(gitlabOrg.OrganizationID, strconv.Itoa(int(gitlabRepo.RepositoryExternalID)), strconv.Itoa(mergeID))
mrCommentContent := PrepareMrCommentContent(missingUsers, signedUsers, signURL)
// Post the MR comment unconditionally — the sign URL is the contributor's
// only way out. SetCommitStatus can fail with 404 "References for commit
// Not Found" when the MR is opened from a fork: the commit only lives in
// the fork's refs, but the webhook hits the upstream project ID. We log
// the status failure and keep going so the comment still lands.
if len(missingUsers) > 0 {
log.WithFields(f).Errorf("merge request faild with 1 or more users not passing authorization - failed users : %+v", missingUsers)
if statusErr := gitlab_api.SetCommitStatus(gitlabClient, projectID, lastCommitSha, gitlab.Failed, missingCLAMsg, signURL); statusErr != nil {
log.WithFields(f).WithError(statusErr).Warnf("problem setting the commit status for merge request ID: %d, sha: %s", mergeID, lastCommitSha)
return fmt.Errorf("setting commit status failed : %v", statusErr)
log.WithFields(f).WithError(statusErr).Warnf("problem setting the commit status for merge request ID: %d, sha: %s (continuing to post MR comment)", mergeID, lastCommitSha)
}

if mrCommentErr := gitlab_api.SetMrComment(gitlabClient, projectID, mergeID, mrCommentContent); mrCommentErr != nil {
Expand All @@ -295,10 +299,8 @@ func (s *service) ProcessMergeActivity(ctx context.Context, secretToken string,
return nil
}

commitStatusErr := gitlab_api.SetCommitStatus(gitlabClient, projectID, lastCommitSha, gitlab.Success, signedCLAMsg, "")
if commitStatusErr != nil {
log.WithFields(f).WithError(commitStatusErr).Warnf("problem setting the commit status for merge request ID: %d, sha: %s", mergeID, lastCommitSha)
return fmt.Errorf("setting commit status failed : %v", commitStatusErr)
if commitStatusErr := gitlab_api.SetCommitStatus(gitlabClient, projectID, lastCommitSha, gitlab.Success, signedCLAMsg, ""); commitStatusErr != nil {
log.WithFields(f).WithError(commitStatusErr).Warnf("problem setting the commit status for merge request ID: %d, sha: %s (continuing to post MR comment)", mergeID, lastCommitSha)
}

if mrCommentErr := gitlab_api.SetMrComment(gitlabClient, projectID, mergeID, mrCommentContent); mrCommentErr != nil {
Expand Down
Loading