Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-01 19:15:52 +01:00
Code Issues Packages Projects Releases Activity

fixed smaller merge issues

Browse Source
This commit is contained in:
Florian Scholdei
2019-02-01 13:51:14 +01:00
parent 704ef72e03
commit a09698d526
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scm-ui/src/repos/containers/RepositoryRoot.js
View File

@@ -33,13 +33,8 @@ import ChangesetView from "./ChangesetView";
import PermissionsNavLink from "../components/PermissionsNavLink"; import PermissionsNavLink from "../components/PermissionsNavLink";
import Sources from "../sources/containers/Sources"; import Sources from "../sources/containers/Sources";
import RepositoryNavLink from "../components/RepositoryNavLink"; import RepositoryNavLink from "../components/RepositoryNavLink";
<<<<<<< working copy
import { getRepositoriesLink } from "../../modules/indexResource";
import { ExtensionPoint } from "@scm-manager/ui-extensions";
=======
import {getLinks, getRepositoriesLink} from "../../modules/indexResource"; import {getLinks, getRepositoriesLink} from "../../modules/indexResource";
import {ExtensionPoint} from "@scm-manager/ui-extensions"; import {ExtensionPoint} from "@scm-manager/ui-extensions";
>>>>>>> merge rev
type Props = { type Props = {
namespace: string, namespace: string,

4
scm-ui/src/users/components/UserForm.js
View File

@@ -141,9 +141,9 @@ class UserForm extends React.Component<Props, State> {
<> <>
{subtitle} {subtitle}
<form onSubmit={this.submit}> <form onSubmit={this.submit}>
<div className="columns"> <div className="columns is-multiline">
{nameField}
<div className="column is-half"> <div className="column is-half">
{nameField}
<InputField <InputField
label={t("user.displayName")} label={t("user.displayName")}
onChange={this.handleDisplayNameChange} onChange={this.handleDisplayNameChange}