From 81d4c2f64f7d78c169a4f7077cb39d73cca06d6b Mon Sep 17 00:00:00 2001
From: Florian Scholdei <florian.scholdei@cloudogu.com>
Date: Mon, 24 Aug 2020 11:29:27 +0200
Subject: [PATCH 1/3] Fix text-overflow in danger zone

---
 .../ui-webapp/src/repos/containers/DangerZone.tsx   | 13 ++++++++++++-
 .../ui-webapp/src/repos/containers/DeleteRepo.tsx   | 10 +++++-----
 .../src/repos/containers/RenameRepository.tsx       |  9 +++++----
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/scm-ui/ui-webapp/src/repos/containers/DangerZone.tsx b/scm-ui/ui-webapp/src/repos/containers/DangerZone.tsx
index 5fb14e4557..3844717487 100644
--- a/scm-ui/ui-webapp/src/repos/containers/DangerZone.tsx
+++ b/scm-ui/ui-webapp/src/repos/containers/DangerZone.tsx
@@ -36,9 +36,20 @@ type Props = {
 };
 
 const DangerZoneContainer = styled.div`
-  padding: 1rem;
+  padding: 1.5rem 1rem;
   border: 1px solid #ff6a88;
   border-radius: 5px;
+  > .level {
+    flex-flow: wrap;
+
+    .level-left {
+      max-width: 100%;
+    }
+
+    .level-right {
+      margin-top: 0.75rem;
+    }
+  }
   > *:not(:last-child) {
     padding-bottom: 1.5rem;
     border-bottom: solid 2px whitesmoke;
diff --git a/scm-ui/ui-webapp/src/repos/containers/DeleteRepo.tsx b/scm-ui/ui-webapp/src/repos/containers/DeleteRepo.tsx
index 8585e98466..23f6ea10a5 100644
--- a/scm-ui/ui-webapp/src/repos/containers/DeleteRepo.tsx
+++ b/scm-ui/ui-webapp/src/repos/containers/DeleteRepo.tsx
@@ -26,9 +26,8 @@ import { connect } from "react-redux";
 import { compose } from "redux";
 import { RouteComponentProps, withRouter } from "react-router-dom";
 import { WithTranslation, withTranslation } from "react-i18next";
-import { History } from "history";
 import { Repository } from "@scm-manager/ui-types";
-import { confirmAlert, DeleteButton, ErrorNotification, Level, ButtonGroup } from "@scm-manager/ui-components";
+import { confirmAlert, DeleteButton, ErrorNotification, Level } from "@scm-manager/ui-components";
 import { deleteRepo, getDeleteRepoFailure, isDeleteRepoPending } from "../modules/repos";
 
 type Props = RouteComponentProps &
@@ -89,10 +88,11 @@ class DeleteRepo extends React.Component<Props> {
         <ErrorNotification error={error} />
         <Level
           left={
-            <div>
+            <p>
               <strong>{t("deleteRepo.subtitle")}</strong>
-              <p>{t("deleteRepo.description")}</p>
-            </div>
+              <br />
+              {t("deleteRepo.description")}
+            </p>
           }
           right={<DeleteButton label={t("deleteRepo.button")} action={action} loading={loading} />}
         />
diff --git a/scm-ui/ui-webapp/src/repos/containers/RenameRepository.tsx b/scm-ui/ui-webapp/src/repos/containers/RenameRepository.tsx
index ede6414029..9254774a6d 100644
--- a/scm-ui/ui-webapp/src/repos/containers/RenameRepository.tsx
+++ b/scm-ui/ui-webapp/src/repos/containers/RenameRepository.tsx
@@ -38,7 +38,7 @@ type Props = {
 };
 
 const RenameRepository: FC<Props> = ({ repository, indexLinks }) => {
-  let history = useHistory();
+  const history = useHistory();
   const [t] = useTranslation("repos");
   const [error, setError] = useState<Error | undefined>(undefined);
   const [loading, setLoading] = useState(false);
@@ -156,10 +156,11 @@ const RenameRepository: FC<Props> = ({ repository, indexLinks }) => {
       />
       <Level
         left={
-          <div>
+          <p>
             <strong>{t("renameRepo.subtitle")}</strong>
-            <p>{t("renameRepo.description")}</p>
-          </div>
+            <br />
+            {t("renameRepo.description")}
+          </p>
         }
         right={
           <Button

From ef382c7721604164172f72e6cd77897c7227b266 Mon Sep 17 00:00:00 2001
From: Florian Scholdei <florian.scholdei@cloudogu.com>
Date: Mon, 24 Aug 2020 11:34:03 +0200
Subject: [PATCH 2/3] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d8fd79db9..34d18286f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+### Fixed
+- Fix text-overflow in danger zone ([#1298](https://github.com/scm-manager/scm-manager/pull/1298))
+
 ## [2.4.0] - 2020-08-14
 ### Added
 - Introduced merge detection for receive hooks ([#1278](https://github.com/scm-manager/scm-manager/pull/1278))

From 92fb2b5eceafb32c9dfb836d114df77f8452d53b Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Mon, 24 Aug 2020 22:15:52 +0000
Subject: [PATCH 3/3] fix: upgrade
 com.fasterxml.jackson.core:jackson-annotations from 2.11.1 to 2.11.2

Snyk has created this PR to upgrade com.fasterxml.jackson.core:jackson-annotations from 2.11.1 to 2.11.2.

See this package in Maven Repository:
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations/

See this project in Snyk:
https://app.snyk.io/org/scm-manager/project/0397d943-538d-483e-9c87-a3f7e7665d7b?utm_source=github&utm_medium=upgrade-pr
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 189584d1fd..f78accff67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -915,7 +915,7 @@
     <jaxrs.version>2.1.1</jaxrs.version>
     <resteasy.version>4.5.6.Final</resteasy.version>
     <jersey-client.version>1.19.4</jersey-client.version>
-    <jackson.version>2.11.1</jackson.version>
+    <jackson.version>2.11.2</jackson.version>
     <guice.version>4.2.3</guice.version>
     <jaxb.version>2.3.3</jaxb.version>
     <hibernate-validator.version>6.1.5.Final</hibernate-validator.version>