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

resolve further merging conflicts

Browse Source
This commit is contained in:
Maren Süwer
2018-09-20 10:06:38 +02:00
parent 05fb961101
commit 33fc15b99c
10 changed files with 103 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,7 @@ import {
isFetchRepoPending
} from "../modules/repos";
import { connect } from "react-redux";
import { Route, Switch } from "react-router-dom";
import { Route } from "react-router-dom";
import type { Repository } from "@scm-manager/ui-types";
import {
Page,
@@ -25,8 +25,8 @@ import Edit from "../containers/Edit";
import type { History } from "history";
import EditNavLink from "../components/EditNavLink";
import ChangesetView from "../changesets/containers/ChangesetView";
import Changesets from "./Changesets";
import ChangesetView from "./ChangesetView";
type Props = {
namespace: string,
@@ -104,15 +104,18 @@ class RepositoryRoot extends React.Component<Props> {
component={() => <Edit repository={repository} />}
/>
<Route
exact
path={`${url}/history`}
component={() => <Changesets repository={repository} />}
/>
<Route
exact
path={`${url}/history/:branch`}
component={() => <Changesets repository={repository} />}
/>
<Route
path={`${url}/changesets/:id`}
exact
path={`${url}/changeset/:id`}
component={() => <ChangesetView repository={repository} />}
/>
</div>