mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-10 15:35:49 +01:00
Merge branch 'develop' into feature/create_gpg_signatures
This commit is contained in:
@@ -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>
|
||||
</>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user