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

Set default branch in branch selector if nothing is selected

Browse Source
This commit is contained in:
Florian Scholdei
2020-09-21 09:58:49 +02:00
parent dcc2c45dad
commit a1ea6ea62e
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-ui/ui-webapp/src/repos/components/changesets/ChangesetDetails.tsx
View File

@@ -102,7 +102,7 @@ const ContributorDetails = styled.div`
const ContributorToggleLine = styled.p` const ContributorToggleLine = styled.p`
cursor: pointer; cursor: pointer;
/** maring-bottom is inherit from content p **/ /** margin-bottom is inherit from content p **/
margin-bottom: 0.5rem !important; margin-bottom: 0.5rem !important;
`; `;

3
scm-ui/ui-webapp/src/repos/containers/ChangesetsRoot.tsx
View File

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

8
yarn.lock
View File

@@ -11719,10 +11719,10 @@ mini-create-react-context@^0.4.0:
"@babel/runtime" "^7.5.5" "@babel/runtime" "^7.5.5"
tiny-warning "^1.0.3" tiny-warning "^1.0.3"
mini-css-extract-plugin@^0.10.0: mini-css-extract-plugin@^0.11.0:
version "0.10.1" version "0.11.2"
resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.10.1.tgz#2592c891f965e15750da6a6c0b60740b5b0cb62d" resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.11.2.tgz#e3af4d5e04fbcaaf11838ab230510073060b37bf"
integrity sha512-9B10gZixtNjHerADBrMxPXM5G0uL0CRGMcLRV67I8nd1SKbwJrI0okKUzD+PxKsUZ9Dxt8/hPvtzF0DrRnrOyA== integrity sha512-h2LknfX4U1kScXxH8xE9LCOqT5B+068EAj36qicMb8l4dqdJoyHcmWmpd+ueyZfgu/POvIn+teoUnTtei2ikug==
dependencies: dependencies:
loader-utils "^1.1.0" loader-utils "^1.1.0"
normalize-url "1.9.1" normalize-url "1.9.1"