diff --git a/bridge/gitlab/import.go b/bridge/gitlab/import.go index 08e4c6ebb8455d3878704191aee45582be41342c..f65aba6a1cf085e1cbd22b3ebf9c33556a5db058 100644 --- a/bridge/gitlab/import.go +++ b/bridge/gitlab/import.go @@ -132,7 +132,7 @@ func (gi *gitlabImporter) ensureNote(repo *cache.RepoCache, b *cache.BugCache, n gitlabID := parseID(note.ID) id, errResolve := b.ResolveOperationWithMetadata(keyGitlabId, gitlabID) - if errResolve != cache.ErrNoMatchingOp { + if errResolve != nil && errResolve != cache.ErrNoMatchingOp { return errResolve } diff --git a/entity/id.go b/entity/id.go index 7fa1785a582590a92ead7e61f82cd5289c50033a..7ff6b2232c6462f71785ce1f5155b19cc88843e1 100644 --- a/entity/id.go +++ b/entity/id.go @@ -17,10 +17,12 @@ const UnsetId = Id("unset") // Id is an identifier for an entity or part of an entity type Id string +// String return the identifier as a string func (i Id) String() string { return string(i) } +// Human return the identifier, shortened for human consumption func (i Id) Human() string { format := fmt.Sprintf("%%.%ds", humanIdLength) return fmt.Sprintf(format, i) diff --git a/graphql/resolvers/operations.go b/graphql/resolvers/operations.go index 3080c98b5f785234ba8e0953282e0f324a3a1f7c..ec803c1f99e9378785aa7398847e09ffa1f7c351 100644 --- a/graphql/resolvers/operations.go +++ b/graphql/resolvers/operations.go @@ -45,7 +45,7 @@ func (editCommentOperationResolver) ID(ctx context.Context, obj *bug.EditComment } func (editCommentOperationResolver) Target(ctx context.Context, obj *bug.EditCommentOperation) (string, error) { - panic("implement me") + return obj.Target.String(), nil } func (editCommentOperationResolver) Date(ctx context.Context, obj *bug.EditCommentOperation) (*time.Time, error) {