diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-13 21:15:14 +0000 |
|---|---|---|
| committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-13 21:15:14 +0000 |
| commit | fd93d8f044eef611d73325660463b599ef997c6d (patch) | |
| tree | a32340888ec9ac26089e975e0373fb325c4c1b66 | |
| parent | 810de209af8430ef3f3e9ee4d818496576b2e66e (diff) | |
| parent | f0ff5fb607abe0d930693de8e23682b6a768e249 (diff) | |
| download | gitlab-ce-fd93d8f044eef611d73325660463b599ef997c6d.tar.gz | |
Merge branch '47830-merge-request-diff-loading-icon-not-visible' into 'master'
Resolve "Merge request diff loading icon not visible"
Closes #47830 and #47849
See merge request gitlab-org/gitlab-ce!19758
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 493c119dc6f..65ab41559be 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -362,7 +362,7 @@ export default class MergeRequestTabs { // // status - Boolean, true to show, false to hide toggleLoading(status) { - $('.mr-loading-status .loading').toggleClass('hidden', !status); + $('.mr-loading-status .loading').toggleClass('hide', !status); } diffViewType() { |