diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-14 00:15:14 +0300 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-06-19 00:56:48 +0300 |
| commit | 598e703ab0d809fbdf14608d5ec3378e333925f7 (patch) | |
| tree | 15570831ab234bbf2070f6861f94f87efb1e2cba | |
| parent | 97441204546ca50b25a3f4a682bac3eff0231ba0 (diff) | |
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() { |