diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-09 09:09:55 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-09 09:09:55 +0300 |
commit | 0221116862ee66024a03492b4fbbe4e069d84303 (patch) | |
tree | e0f46cc3c30534ab731af27c574183b1e222fd0e /app/assets/javascripts/create_merge_request_dropdown.js | |
parent | ce130e211808c9b02116f30af4a043f1a4d3a717 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/create_merge_request_dropdown.js')
-rw-r--r-- | app/assets/javascripts/create_merge_request_dropdown.js | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/assets/javascripts/create_merge_request_dropdown.js b/app/assets/javascripts/create_merge_request_dropdown.js index 085df1ff9eb..229612f5e9d 100644 --- a/app/assets/javascripts/create_merge_request_dropdown.js +++ b/app/assets/javascripts/create_merge_request_dropdown.js @@ -42,7 +42,7 @@ export default class CreateMergeRequestDropdown { this.refInput = this.wrapperEl.querySelector('.js-ref'); this.refMessage = this.wrapperEl.querySelector('.js-ref-message'); this.unavailableButton = this.wrapperEl.querySelector('.unavailable'); - this.unavailableButtonArrow = this.unavailableButton.querySelector('.spinner'); + this.unavailableButtonSpinner = this.unavailableButton.querySelector('.spinner'); this.unavailableButtonText = this.unavailableButton.querySelector('.text'); this.branchCreated = false; @@ -417,12 +417,10 @@ export default class CreateMergeRequestDropdown { setUnavailableButtonState(isLoading = true) { if (isLoading) { - this.unavailableButtonArrow.classList.remove('hide'); - this.unavailableButtonArrow.classList.remove('fa-exclamation-triangle'); + this.unavailableButtonSpinner.classList.remove('hide'); this.unavailableButtonText.textContent = __('Checking branch availability...'); } else { - this.unavailableButtonArrow.classList.add('hide'); - this.unavailableButtonArrow.classList.add('fa-exclamation-triangle'); + this.unavailableButtonSpinner.classList.add('hide'); this.unavailableButtonText.textContent = __('New branch unavailable'); } } |