diff options
| author | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-20 10:32:13 +0000 |
|---|---|---|
| committer | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-20 10:32:13 +0000 |
| commit | 19ff81775c820d282b60e1f6245c9251716cca01 (patch) | |
| tree | 60121429f0008defcc05889806c53c07cd2b3957 | |
| parent | 4f40560836be0f66fbfb69d9e5af2755da8e9ebb (diff) | |
| parent | 229f806835bf63f2f68af8740b54399598ae45bc (diff) | |
| download | gitlab-ce-19ff81775c820d282b60e1f6245c9251716cca01.tar.gz | |
Merge branch '28295-mr-loading-icon' into 'master'
fix MR jobs loading icon visibility
Closes #28295
See merge request !9324
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js.es6 | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/mini_pipeline_graph_dropdown.js.es6 | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.es6 b/app/assets/javascripts/merge_request_widget.js.es6 index 4ab33420e59..88f08bbaa34 100644 --- a/app/assets/javascripts/merge_request_widget.js.es6 +++ b/app/assets/javascripts/merge_request_widget.js.es6 @@ -252,7 +252,6 @@ require('./smart_interval'); $('.ci_widget.ci-error').show(); this.setMergeButtonClass('btn-danger'); } - this.initMiniPipelineGraph(); }; MergeRequestWidget.prototype.showCICoverage = function(coverage) { diff --git a/app/assets/javascripts/mini_pipeline_graph_dropdown.js.es6 b/app/assets/javascripts/mini_pipeline_graph_dropdown.js.es6 index 919fcd0a07b..2145e531331 100644 --- a/app/assets/javascripts/mini_pipeline_graph_dropdown.js.es6 +++ b/app/assets/javascripts/mini_pipeline_graph_dropdown.js.es6 @@ -28,7 +28,7 @@ * All dropdown events are fired at the .dropdown-menu's parent element. */ bindEvents() { - $(document).on('shown.bs.dropdown', this.container, this.getBuildsList); + $(document).off('shown.bs.dropdown', this.container).on('shown.bs.dropdown', this.container, this.getBuildsList); } /** |