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

Merge with upstream

Browse Source
This commit is contained in:
Florian Scholdei
2020-09-21 12:16:35 +02:00
parent a268eee3a4 a8d1bf0d60
commit 7159f4766c
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Missing synchronization during repository creation ([#1328](https://github.com/scm-manager/scm-manager/pull/1328)) - Missing synchronization during repository creation ([#1328](https://github.com/scm-manager/scm-manager/pull/1328))
- Missing BranchCreatedEvent for mercurial ([#1334](https://github.com/scm-manager/scm-manager/pull/1334)) - Missing BranchCreatedEvent for mercurial ([#1334](https://github.com/scm-manager/scm-manager/pull/1334))
- Branch not found right after creation ([#1334](https://github.com/scm-manager/scm-manager/pull/1334)) - Branch not found right after creation ([#1334](https://github.com/scm-manager/scm-manager/pull/1334))
- Set default branch in branch selector if nothing is selected ([#1338](https://github.com/scm-manager/scm-manager/pull/1338))
- Handling of branch with slashes in source view ([#1340](https://github.com/scm-manager/scm-manager/pull/1340)) - Handling of branch with slashes in source view ([#1340](https://github.com/scm-manager/scm-manager/pull/1340))
## [2.5.0] - 2020-09-10 ## [2.5.0] - 2020-09-10

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

@@ -70,12 +70,13 @@ class ChangesetsRoot extends React.Component<Props> {
} }
const url = urls.stripEndingSlash(match.url); const url = urls.stripEndingSlash(match.url);
const defaultBranch = branches?.find(b => b.defaultBranch === true);
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()}
/> />