Merge with upstream

This commit is contained in:
Florian Scholdei
2020-09-21 12:16:35 +02:00
3 changed files with 4 additions and 2 deletions

View File

@@ -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;
`;

View File

@@ -70,12 +70,13 @@ class ChangesetsRoot extends React.Component<Props> {
}
const url = urls.stripEndingSlash(match.url);
const defaultBranch = branches?.find(b => b.defaultBranch === true);
return (
<>
<CodeActionBar
branches={branches}
selectedBranch={!this.isBranchAvailable() ? selectedBranch : undefined}
selectedBranch={!this.isBranchAvailable() ? selectedBranch : defaultBranch?.name}
onSelectBranch={this.onSelectBranch}
switchViewLink={this.evaluateSwitchViewLink()}
/>