Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
4cfd6d09
Commit
4cfd6d09
authored
Mar 06, 2020
by
Justin Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spinner in Create MR dropdown
parent
636f17bc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
app/assets/javascripts/create_merge_request_dropdown.js
app/assets/javascripts/create_merge_request_dropdown.js
+3
-5
changelogs/unreleased/209207-spinner-appears-to-be-broken.yml
...gelogs/unreleased/209207-spinner-appears-to-be-broken.yml
+5
-0
No files found.
app/assets/javascripts/create_merge_request_dropdown.js
View file @
4cfd6d09
...
@@ -42,7 +42,7 @@ export default class CreateMergeRequestDropdown {
...
@@ -42,7 +42,7 @@ export default class CreateMergeRequestDropdown {
this
.
refInput
=
this
.
wrapperEl
.
querySelector
(
'
.js-ref
'
);
this
.
refInput
=
this
.
wrapperEl
.
querySelector
(
'
.js-ref
'
);
this
.
refMessage
=
this
.
wrapperEl
.
querySelector
(
'
.js-ref-message
'
);
this
.
refMessage
=
this
.
wrapperEl
.
querySelector
(
'
.js-ref-message
'
);
this
.
unavailableButton
=
this
.
wrapperEl
.
querySelector
(
'
.unavailable
'
);
this
.
unavailableButton
=
this
.
wrapperEl
.
querySelector
(
'
.unavailable
'
);
this
.
unavailableButton
Arrow
=
this
.
unavailableButton
.
querySelector
(
'
.spinner
'
);
this
.
unavailableButton
Spinner
=
this
.
unavailableButton
.
querySelector
(
'
.spinner
'
);
this
.
unavailableButtonText
=
this
.
unavailableButton
.
querySelector
(
'
.text
'
);
this
.
unavailableButtonText
=
this
.
unavailableButton
.
querySelector
(
'
.text
'
);
this
.
branchCreated
=
false
;
this
.
branchCreated
=
false
;
...
@@ -417,12 +417,10 @@ export default class CreateMergeRequestDropdown {
...
@@ -417,12 +417,10 @@ export default class CreateMergeRequestDropdown {
setUnavailableButtonState
(
isLoading
=
true
)
{
setUnavailableButtonState
(
isLoading
=
true
)
{
if
(
isLoading
)
{
if
(
isLoading
)
{
this
.
unavailableButtonArrow
.
classList
.
remove
(
'
hide
'
);
this
.
unavailableButtonSpinner
.
classList
.
remove
(
'
hide
'
);
this
.
unavailableButtonArrow
.
classList
.
remove
(
'
fa-exclamation-triangle
'
);
this
.
unavailableButtonText
.
textContent
=
__
(
'
Checking branch availability...
'
);
this
.
unavailableButtonText
.
textContent
=
__
(
'
Checking branch availability...
'
);
}
else
{
}
else
{
this
.
unavailableButtonArrow
.
classList
.
add
(
'
hide
'
);
this
.
unavailableButtonSpinner
.
classList
.
add
(
'
hide
'
);
this
.
unavailableButtonArrow
.
classList
.
add
(
'
fa-exclamation-triangle
'
);
this
.
unavailableButtonText
.
textContent
=
__
(
'
New branch unavailable
'
);
this
.
unavailableButtonText
.
textContent
=
__
(
'
New branch unavailable
'
);
}
}
}
}
...
...
changelogs/unreleased/209207-spinner-appears-to-be-broken.yml
0 → 100644
View file @
4cfd6d09
---
title
:
Fix spinner in Create MR dropdown
merge_request
:
26679
author
:
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment