diff options
| author | Jared Deckard <jared.deckard@gmail.com> | 2016-07-28 12:40:17 -0500 |
|---|---|---|
| committer | Jared Deckard <jared.deckard@gmail.com> | 2016-09-08 14:07:27 -0500 |
| commit | 913857e57765f6911f171fb2fcd12532d6b6f1df (patch) | |
| tree | 94b0e1dbef817af084d62730a2cc11020e3a65a0 /app | |
| parent | 7f6474b269a5cfa454d28c0c0da969490c9eb33e (diff) | |
| download | gitlab-ce-913857e57765f6911f171fb2fcd12532d6b6f1df.tar.gz | |
Require comments must be included before code
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 5316101457c..dcba4a8d275 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -264,7 +264,6 @@ }); }; -<<<<<<< a79ff9346b73079148cc4ecc81da82804bb51f3c MergeRequestTabs.prototype.loadPipelines = function(source) { if (this.pipelinesLoaded) { return; @@ -280,11 +279,9 @@ }); }; -======= // Show or hide the loading spinner // // status - Boolean, true to show, false to hide ->>>>>>> Restore comments lost when converting CoffeeScript to JavaScript MergeRequestTabs.prototype.toggleLoading = function(status) { return $('.mr-loading-status .loading').toggle(status); }; |