|
|
|
@ -1221,7 +1221,7 @@ export function Workspace() { |
|
|
|
|
className="btn btn-light btn-block w-100 d-inline-block border border-dark form-control h-100 p-0 pl-2 pr-2 text-dark" |
|
|
|
|
icon={null} |
|
|
|
|
> |
|
|
|
|
{global.fs.browser.isRequestingCloning ? <i className="fad fa-spinner fa-spin"></i> : currentBranch || '-none-'} |
|
|
|
|
{global.fs.browser.isRequestingCloning ? <i className="fad fa-spinner fa-spin"></i> : (currentBranch && currentBranch.name) || '-none-'} |
|
|
|
|
</Dropdown.Toggle> |
|
|
|
|
|
|
|
|
|
<Dropdown.Menu as={CustomMenu} className="custom-dropdown-items branches-dropdown"> |
|
|
|
@ -1262,7 +1262,7 @@ export function Workspace() { |
|
|
|
|
title={intl.formatMessage({ id: `filePanel.switchToBranch${branch.remote ? 'Title1' : 'Title2'}` })} |
|
|
|
|
> |
|
|
|
|
<div data-id={`workspaceGit-${branch.remote ? `${branch.remote.name}/${branch.name}` : branch.name}`}> |
|
|
|
|
{currentBranch === branch.name && !branch.remote ? ( |
|
|
|
|
{currentBranch && currentBranch.name === branch.name && !branch.remote ? ( |
|
|
|
|
<span> |
|
|
|
|
✓ <i className="far fa-code-branch"></i> |
|
|
|
|
<span className="pl-1">{branch.name}</span> |
|
|
|
@ -1282,7 +1282,7 @@ export function Workspace() { |
|
|
|
|
<div className="pl-1 pr-1" data-id="workspaceGitCreateNewBranch"> |
|
|
|
|
<i className="fas fa-code-branch pr-2"></i> |
|
|
|
|
<span> |
|
|
|
|
<FormattedMessage id="filePanel.createBranch" />: {branchFilter} from '{currentBranch}' |
|
|
|
|
<FormattedMessage id="filePanel.createBranch" />: {branchFilter} from '{currentBranch && currentBranch.name}' |
|
|
|
|
</span> |
|
|
|
|
</div> |
|
|
|
|
</Dropdown.Item> |
|
|
|
|