undo changes from switching from wrong branch

This commit is contained in:
Florian Scholdei
2019-01-18 10:32:47 +01:00
parent 03813b40af
commit 83321a195e
2 changed files with 6 additions and 15 deletions

View File

@@ -3,16 +3,15 @@ import React from "react";
import type { Changeset, Repository, Tag } from "@scm-manager/ui-types"; import type { Changeset, Repository, Tag } from "@scm-manager/ui-types";
import classNames from "classnames"; import classNames from "classnames";
import { Interpolate, translate } from "react-i18next"; import {Interpolate, translate} from "react-i18next";
import ChangesetId from "./ChangesetId"; import ChangesetId from "./ChangesetId";
import injectSheet from "react-jss"; import injectSheet from "react-jss";
import { DateFromNow } from "../.."; import {DateFromNow} from "../..";
import ChangesetAuthor from "./ChangesetAuthor"; import ChangesetAuthor from "./ChangesetAuthor";
import ChangesetTag from "./ChangesetTag"; import ChangesetTag from "./ChangesetTag";
import { parseDescription } from "./changesets"; import {parseDescription} from "./changesets";
import { AvatarWrapper, AvatarImage } from "../../avatar"; import {AvatarWrapper, AvatarImage} from "../../avatar";
import { ExtensionPoint } from "@scm-manager/ui-extensions";
const styles = { const styles = {
pointer: { pointer: {
@@ -65,15 +64,7 @@ class ChangesetRow extends React.Component<Props> {
<div className={classNames("media-content", classes.withOverflow)}> <div className={classNames("media-content", classes.withOverflow)}>
<div className="content"> <div className="content">
<p className="is-ellipsis-overflow"> <p className="is-ellipsis-overflow">
<strong> <strong>{description.title}</strong>
<ExtensionPoint
name="changesets.changeset.description"
props={{ changeset, value: description.title }}
renderAll={true}
>
{description.title}
</ExtensionPoint>
</strong>
<br /> <br />
<Interpolate <Interpolate
i18nKey="changesets.changeset.summary" i18nKey="changesets.changeset.summary"

View File

@@ -65,6 +65,6 @@
"passwordInvalid": "Password has to be between 6 and 32 characters", "passwordInvalid": "Password has to be between 6 and 32 characters",
"passwordConfirmFailed": "Passwords have to be identical", "passwordConfirmFailed": "Passwords have to be identical",
"submit": "Submit", "submit": "Submit",
"changedSuccessfully": "Pasword successfully changed" "changedSuccessfully": "Password changed successfully"
} }
} }