From 20b1e7a4774f8448baa7abdd2e52553c2336005c Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 2 Dec 2020 16:07:42 +0100
Subject: [PATCH 1/2] Keep state even if import pending changes

---
 .../src/repos/containers/ImportRepository.tsx | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/scm-ui/ui-webapp/src/repos/containers/ImportRepository.tsx b/scm-ui/ui-webapp/src/repos/containers/ImportRepository.tsx
index bc7631db68..05187b0eba 100644
--- a/scm-ui/ui-webapp/src/repos/containers/ImportRepository.tsx
+++ b/scm-ui/ui-webapp/src/repos/containers/ImportRepository.tsx
@@ -48,6 +48,20 @@ type Props = {
   fetchNamespaceStrategiesIfNeeded: () => void;
 };
 
+const ImportPendingLoading = ({ importPending }: { importPending: boolean }) => {
+  const [t] = useTranslation("repos");
+  if (!importPending) {
+    return null;
+  }
+  return (
+    <>
+      <Notification type="info">{t("import.pending.infoText")}</Notification>
+      <Loading />
+      <hr />
+    </>
+  );
+};
+
 const ImportRepository: FC<Props> = ({
   repositoryTypes,
   pageLoading,
@@ -92,13 +106,7 @@ const ImportRepository: FC<Props> = ({
       error={error}
       showContentOnError={true}
     >
-      {importPending && (
-        <>
-          <Notification type="info">{t("import.pending.infoText")}</Notification>
-          <Loading />
-          <hr />
-        </>
-      )}
+      <ImportPendingLoading importPending={importPending} />
       <ImportRepositoryTypeSelect
         repositoryTypes={repositoryTypes}
         repositoryType={repositoryType}

From f6863a26762a210bc6d32a7010cbfcd646054686 Mon Sep 17 00:00:00 2001
From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Date: Thu, 3 Dec 2020 08:54:43 +0100
Subject: [PATCH 2/2] Apply suggestions from code review

fix javadoc

Co-authored-by: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
---
 .../main/java/sonia/scm/repository/RepositoryManager.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java
index 1660cebe1b..ba5ff44ce2 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java
@@ -102,9 +102,9 @@ public interface RepositoryManager
   /**
    * Creates a new repository and afterwards executes the logic from the {@param afterCreation}.
    *
-   * @param repository    the repository {@link Repository}
-   * @param afterCreation consumer which expects a repository {@link Repository}
-   * @return {@link Repository} the created repository
+   * @param repository the repository to create
+   * @param afterCreation consumer which is executed after the repository was created
+   * @return created repository
    *
    * @since 2.11.0
    */