diff options
| author | Jared Deckard <jared.deckard@gmail.com> | 2016-07-26 22:32:10 -0500 |
|---|---|---|
| committer | Jared Deckard <jared.deckard@gmail.com> | 2016-09-08 12:23:12 -0500 |
| commit | 7f6474b269a5cfa454d28c0c0da969490c9eb33e (patch) | |
| tree | aafe7df9bc2683712a466595a046adb57e222565 /app/assets/javascripts/merge_request_widget.js | |
| parent | 4c833a1d4ead49c27f6a81e607d10a5c6f0fcc2b (diff) | |
| download | gitlab-ce-7f6474b269a5cfa454d28c0c0da969490c9eb33e.tar.gz | |
Restore comments lost when converting CoffeeScript to JavaScript
Diffstat (limited to 'app/assets/javascripts/merge_request_widget.js')
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js b/app/assets/javascripts/merge_request_widget.js index bd35b6f679d..7bbcdf59838 100644 --- a/app/assets/javascripts/merge_request_widget.js +++ b/app/assets/javascripts/merge_request_widget.js @@ -3,6 +3,12 @@ this.MergeRequestWidget = (function() { function MergeRequestWidget(opts) { + // Initialize MergeRequestWidget behavior + // + // check_enable - Boolean, whether to check automerge status + // merge_check_url - String, URL to use to check automerge status + // ci_status_url - String, URL to use to check CI status + // this.opts = opts; $('#modal_merge_info').modal({ show: false @@ -118,6 +124,8 @@ if (data.coverage) { _this.showCICoverage(data.coverage); } + // The first check should only update the UI, a notification + // should only be displayed on status changes if (showNotification && !_this.firstCICheck) { status = _this.ciLabelForStatus(data.status); if (status === "preparing") { |