Commit 913857e5 authored by Jared Deckard's avatar Jared Deckard

Require comments must be included before code

parent 7f6474b2
No related merge requests found
......@@ -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);
};
......
(function() {
}).call(this);
// PhantomJS (Teaspoons default driver) doesn't have support for
// Function.prototype.bind, which has caused confusion. Use this polyfill to
// avoid the confusion.
......@@ -40,3 +35,8 @@
// instance) you can disable the suite matcher in the configuration and use this
// file as a manifest.
// For more information: http://github.com/modeset/teaspoon
(function() {
}).call(this);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment