diff --git a/scm-ui/ui-webapp/src/repos/components/changesets/ChangesetDetails.tsx b/scm-ui/ui-webapp/src/repos/components/changesets/ChangesetDetails.tsx index ab691be69c..f6caa08c9b 100644 --- a/scm-ui/ui-webapp/src/repos/components/changesets/ChangesetDetails.tsx +++ b/scm-ui/ui-webapp/src/repos/components/changesets/ChangesetDetails.tsx @@ -102,7 +102,7 @@ const ContributorDetails = styled.div` const ContributorToggleLine = styled.p` cursor: pointer; - /** maring-bottom is inherit from content p **/ + /** margin-bottom is inherit from content p **/ margin-bottom: 0.5rem !important; `; diff --git a/scm-ui/ui-webapp/src/repos/containers/ChangesetsRoot.tsx b/scm-ui/ui-webapp/src/repos/containers/ChangesetsRoot.tsx index 5bc0e0d6e7..0a01e96b3a 100644 --- a/scm-ui/ui-webapp/src/repos/containers/ChangesetsRoot.tsx +++ b/scm-ui/ui-webapp/src/repos/containers/ChangesetsRoot.tsx @@ -76,12 +76,13 @@ class ChangesetsRoot extends React.Component { } const url = this.stripEndingSlash(match.url); + const defaultBranch = branches?.filter(b => b.defaultBranch === true)[0]; return ( <> diff --git a/yarn.lock b/yarn.lock index 552c9c455f..a7a1a693eb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11719,10 +11719,10 @@ mini-create-react-context@^0.4.0: "@babel/runtime" "^7.5.5" tiny-warning "^1.0.3" -mini-css-extract-plugin@^0.10.0: - version "0.10.1" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.10.1.tgz#2592c891f965e15750da6a6c0b60740b5b0cb62d" - integrity sha512-9B10gZixtNjHerADBrMxPXM5G0uL0CRGMcLRV67I8nd1SKbwJrI0okKUzD+PxKsUZ9Dxt8/hPvtzF0DrRnrOyA== +mini-css-extract-plugin@^0.11.0: + version "0.11.2" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.11.2.tgz#e3af4d5e04fbcaaf11838ab230510073060b37bf" + integrity sha512-h2LknfX4U1kScXxH8xE9LCOqT5B+068EAj36qicMb8l4dqdJoyHcmWmpd+ueyZfgu/POvIn+teoUnTtei2ikug== dependencies: loader-utils "^1.1.0" normalize-url "1.9.1"