Merge branch 'develop' into feature/create_gpg_signatures

This commit is contained in:
Konstantin Schaper
2020-08-12 13:40:45 +02:00
committed by GitHub
15 changed files with 4750 additions and 45 deletions

View File

@@ -44,10 +44,12 @@ import {
import ContributorTable from "./ContributorTable";
import { Link as ReactLink } from "react-router-dom";
import SignatureIcon from "@scm-manager/ui-components/src/repos/changesets/SignatureIcon";
import { FileControlFactory } from "@scm-manager/ui-components";
type Props = WithTranslation & {
changeset: Changeset;
repository: Repository;
fileControlFactory?: FileControlFactory;
};
type State = {
@@ -147,6 +149,7 @@ const Contributors: FC<{ changeset: Changeset }> = ({ changeset }) => {
</ContributorDetails>
);
}
return (
<>
<ContributorLine onClick={e => setOpen(!open)}>
@@ -175,7 +178,7 @@ class ChangesetDetails extends React.Component<Props, State> {
}
render() {
const { changeset, repository, t } = this.props;
const { changeset, repository, fileControlFactory, t } = this.props;
const { collapsed } = this.state;
const description = changesets.parseDescription(changeset.description);
@@ -256,7 +259,7 @@ class ChangesetDetails extends React.Component<Props, State> {
/>
}
/>
<ChangesetDiff changeset={changeset} defaultCollapse={collapsed} />
<ChangesetDiff changeset={changeset} fileControlFactory={fileControlFactory} defaultCollapse={collapsed} />
</div>
</>
);