diff --git a/scm-ui/ui-webapp/src/repos/branches/components/BranchRow.tsx b/scm-ui/ui-webapp/src/repos/branches/components/BranchRow.tsx
index 02d97c43a9..f1ee1d5a5f 100644
--- a/scm-ui/ui-webapp/src/repos/branches/components/BranchRow.tsx
+++ b/scm-ui/ui-webapp/src/repos/branches/components/BranchRow.tsx
@@ -26,10 +26,11 @@ import { Link as ReactLink } from "react-router-dom";
import { useTranslation } from "react-i18next";
import classNames from "classnames";
import { Branch, BranchDetails, Link, Repository } from "@scm-manager/ui-types";
-import { DateFromNow, Icon, SmallLoadingSpinner } from "@scm-manager/ui-components";
+import { Icon, SmallLoadingSpinner } from "@scm-manager/ui-components";
import { binder } from "@scm-manager/ui-extensions";
import DefaultBranchTag from "./DefaultBranchTag";
import AheadBehindTag from "./AheadBehindTag";
+import BranchCommitDateCommitter from "./BranchCommitDateCommitter";
type Props = {
repository: Repository;
@@ -67,23 +68,6 @@ const BranchRow: FC
= ({ repository, baseUrl, branch, onDelete, details }
return ;
};
- const committedAt = (
- <>
- {t("branches.table.lastCommit")}
- >
- );
-
- let committedAtBy;
- if (branch.lastCommitter?.name) {
- committedAtBy = (
- <>
- {committedAt} {t("branches.table.lastCommitter", { name: branch.lastCommitter?.name })}
- >
- );
- } else {
- committedAtBy = committedAt;
- }
-
const extensionProps = { repository, branch, details };
return (
@@ -93,7 +77,7 @@ const BranchRow: FC = ({ repository, baseUrl, branch, onDelete, details }
{branch.lastCommitDate && (
- {committedAtBy}
+
)}
diff --git a/scm-ui/ui-webapp/src/repos/branches/components/DefaultBranchTag.tsx b/scm-ui/ui-webapp/src/repos/branches/components/DefaultBranchTag.tsx
index 7b58f73e35..8c38cc30f8 100644
--- a/scm-ui/ui-webapp/src/repos/branches/components/DefaultBranchTag.tsx
+++ b/scm-ui/ui-webapp/src/repos/branches/components/DefaultBranchTag.tsx
@@ -28,6 +28,7 @@ import styled from "styled-components";
type Props = WithTranslation & {
defaultBranch?: boolean;
+ className?: string;
};
const DefaultTag = styled(Tag)`
@@ -36,10 +37,12 @@ const DefaultTag = styled(Tag)`
class DefaultBranchTag extends React.Component {
render() {
- const { defaultBranch, t } = this.props;
+ const { defaultBranch, className, t } = this.props;
if (defaultBranch) {
- return ;
+ return (
+
+ );
}
return null;
}