diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-11-28 20:54:07 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-28 20:54:07 +0000 |
commit | a2151955130044a6ed765687a000ac7523a51139 (patch) | |
tree | 53db04bda17af56444c6031787997947fdd881cc /app | |
parent | 29d86842747c4a9faf52edd5a25564e271983335 (diff) | |
parent | d8e21b1bfda544033e4b1830fae7b6f9101279a1 (diff) | |
download | gitlab-ce-a2151955130044a6ed765687a000ac7523a51139.tar.gz |
Merge branch '24985-environments-spinner' into 'master'
Adds spinner class
## What does this MR do?
Adds class to spinner icon to actually spin.
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #24985
See merge request !7761
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/environments/components/environment.js.es6 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6 index 35e183a9086..84faabf938a 100644 --- a/app/assets/javascripts/environments/components/environment.js.es6 +++ b/app/assets/javascripts/environments/components/environment.js.es6 @@ -181,7 +181,7 @@ <div class="environments-container"> <div class="environments-list-loading text-center" v-if="isLoading"> - <i class="fa fa-spinner spin"></i> + <i class="fa fa-spinner fa-spin"></i> </div> <div class="blank-state blank-state-no-icon" |