From 6e9af40b443624f6421a3f725a71953ec184b084 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Thu, 4 Apr 2019 16:56:35 +0200 Subject: [PATCH 1/2] changed horizontal line structure which means that no unnecessary line is displayed if the delete button is missing --- scm-plugins/scm-git-plugin/src/main/js/RepositoryConfig.js | 2 +- scm-ui/src/repos/containers/DeleteRepo.js | 1 + scm-ui/src/repos/containers/EditRepo.js | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scm-plugins/scm-git-plugin/src/main/js/RepositoryConfig.js b/scm-plugins/scm-git-plugin/src/main/js/RepositoryConfig.js index fabb677045..96085ec2f2 100644 --- a/scm-plugins/scm-git-plugin/src/main/js/RepositoryConfig.js +++ b/scm-plugins/scm-git-plugin/src/main/js/RepositoryConfig.js @@ -121,6 +121,7 @@ class RepositoryConfig extends React.Component { if (!(loadingBranches || loadingDefaultBranch)) { return ( <> +
{this.renderBranchChangedNotification()}
@@ -133,7 +134,6 @@ class RepositoryConfig extends React.Component { /> { submitButton } -
); } else { diff --git a/scm-ui/src/repos/containers/DeleteRepo.js b/scm-ui/src/repos/containers/DeleteRepo.js index b621a1998b..aefedef0b4 100644 --- a/scm-ui/src/repos/containers/DeleteRepo.js +++ b/scm-ui/src/repos/containers/DeleteRepo.js @@ -74,6 +74,7 @@ class DeleteRepo extends React.Component { return ( <> +
diff --git a/scm-ui/src/repos/containers/EditRepo.js b/scm-ui/src/repos/containers/EditRepo.js index 2e5bb69172..ddbe3535fb 100644 --- a/scm-ui/src/repos/containers/EditRepo.js +++ b/scm-ui/src/repos/containers/EditRepo.js @@ -70,7 +70,6 @@ class EditRepo extends React.Component { this.props.modifyRepo(repo, this.repoModified); }} /> -
Date: Wed, 10 Apr 2019 08:18:38 +0000 Subject: [PATCH 2/2] Close branch bugfix/repo_horizontal_lines