merge with develop branch

This commit is contained in:
Sebastian Sdorra
2020-03-26 11:40:47 +01:00
67 changed files with 1620 additions and 919 deletions

View File

@@ -34,7 +34,7 @@ type Props = {
class BranchRow extends React.Component<Props> {
renderLink(to: string, label: string, defaultBranch?: boolean) {
return (
<Link to={to}>
<Link to={to} title={label}>
{label} <DefaultBranchTag defaultBranch={defaultBranch} />
</Link>
);

View File

@@ -35,7 +35,7 @@ class BranchTable extends React.Component<Props> {
render() {
const { t } = this.props;
return (
<table className="card-table table is-hoverable is-fullwidth">
<table className="card-table table is-hoverable is-fullwidth is-word-break">
<thead>
<tr>
<th>{t("branches.table.branches")}</th>

View File

@@ -53,7 +53,7 @@ class RepositoryDetailTable extends React.Component<Props> {
</tr>
<tr>
<th>{t("repository.description")}</th>
<td>{repository.description}</td>
<td className="is-word-break">{repository.description}</td>
</tr>
<tr>
<th>{t("repository.creationDate")}</th>

View File

@@ -32,6 +32,9 @@ import {
Loading,
NavLink,
Page,
CustomQueryFlexWrappedColumns,
PrimaryContentColumn,
SecondaryNavigationColumn,
SecondaryNavigation,
SubNavigation,
MenuContext,
@@ -173,8 +176,8 @@ class RepositoryRoot extends React.Component<Props, State> {
title={repository.namespace + "/" + repository.name}
afterTitle={<ExtensionPoint name={"repository.afterTitle"} props={{ repository }} />}
>
<div className="columns">
<div className="column">
<CustomQueryFlexWrappedColumns>
<PrimaryContentColumn collapsed={menuCollapsed}>
<Switch>
<Redirect exact from={this.props.match.url} to={redirectedUrl} />
@@ -223,8 +226,8 @@ class RepositoryRoot extends React.Component<Props, State> {
<Route path={`${url}/branches/create`} render={() => <CreateBranch repository={repository} />} />
<ExtensionPoint name="repository.route" props={extensionProps} renderAll={true} />
</Switch>
</div>
<div className={menuCollapsed ? "column is-1" : "column is-3"}>
</PrimaryContentColumn>
<SecondaryNavigationColumn collapsed={menuCollapsed}>
<SecondaryNavigation
label={t("repositoryRoot.menu.navigationLabel")}
onCollapse={() => this.onCollapseRepositoryMenu(!menuCollapsed)}
@@ -268,8 +271,8 @@ class RepositoryRoot extends React.Component<Props, State> {
<ExtensionPoint name="repository.setting" props={extensionProps} renderAll={true} />
</SubNavigation>
</SecondaryNavigation>
</div>
</div>
</SecondaryNavigationColumn>
</CustomQueryFlexWrappedColumns>
</Page>
</MenuContext.Provider>
);