merge 2.0.0-m3

This commit is contained in:
Maren Süwer
2018-11-05 14:31:17 +01:00
84 changed files with 7633 additions and 5356 deletions

View File

@@ -80,11 +80,6 @@ class RepositoryRoot extends React.Component<Props> {
this.props.deleteRepo(repository, this.deleted);
};
matchChangeset = (route: any) => {
const url = this.matchedUrl();
return route.location.pathname.match(`${url}/changeset/`);
};
matches = (route: any) => {
const url = this.matchedUrl();
const regex = new RegExp(`${url}(/branches)?/?[^/]*/changesets?.*`);
@@ -125,7 +120,7 @@ class RepositoryRoot extends React.Component<Props> {
/>
<Route
path={`${url}/permissions`}
render={props => (
render={() => (
<Permissions
namespace={this.props.repository.namespace}
repoName={this.props.repository.name}