From 94a6ffcb04063017e89023ce24f38ca2d64c58d0 Mon Sep 17 00:00:00 2001
From: Konstantin Schaper <konstantin.schaper@cloudogu.com>
Date: Tue, 1 Dec 2020 09:18:40 +0100
Subject: [PATCH] fix merge error

---
 .../api/v2/resources/DefaultChangesetToChangesetDtoMapper.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DefaultChangesetToChangesetDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DefaultChangesetToChangesetDtoMapper.java
index baf6b7476d..fc887ff62d 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DefaultChangesetToChangesetDtoMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DefaultChangesetToChangesetDtoMapper.java
@@ -114,6 +114,9 @@ public abstract class DefaultChangesetToChangesetDtoMapper extends HalAppenderMa
       .single(link("modifications", resourceLinks.modifications().self(namespace, name, source.getId())));
 
     try (RepositoryService repositoryService = serviceFactory.create(repository)) {
+      if (repositoryService.isSupported(Command.TAGS)) {
+        embeddedBuilder.with("tags", tagCollectionToDtoMapper.getMinimalEmbeddedTagDtoList(namespace, name, source.getTags()));
+      }
       if (repositoryService.isSupported(Command.TAG) && RepositoryPermissions.push(repository).isPermitted()) {
         linksBuilder.single(link("tag", resourceLinks.tag().create(namespace, name)));
       }