Require comments must be included before code
This commit is contained in:
parent
7f6474b269
commit
913857e577
|
@ -264,7 +264,6 @@
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
<<<<<<< a79ff9346b73079148cc4ecc81da82804bb51f3c
|
|
||||||
MergeRequestTabs.prototype.loadPipelines = function(source) {
|
MergeRequestTabs.prototype.loadPipelines = function(source) {
|
||||||
if (this.pipelinesLoaded) {
|
if (this.pipelinesLoaded) {
|
||||||
return;
|
return;
|
||||||
|
@ -280,11 +279,9 @@
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
=======
|
|
||||||
// Show or hide the loading spinner
|
// Show or hide the loading spinner
|
||||||
//
|
//
|
||||||
// status - Boolean, true to show, false to hide
|
// status - Boolean, true to show, false to hide
|
||||||
>>>>>>> Restore comments lost when converting CoffeeScript to JavaScript
|
|
||||||
MergeRequestTabs.prototype.toggleLoading = function(status) {
|
MergeRequestTabs.prototype.toggleLoading = function(status) {
|
||||||
return $('.mr-loading-status .loading').toggle(status);
|
return $('.mr-loading-status .loading').toggle(status);
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,8 +1,3 @@
|
||||||
(function() {
|
|
||||||
|
|
||||||
|
|
||||||
}).call(this);
|
|
||||||
|
|
||||||
// PhantomJS (Teaspoons default driver) doesn't have support for
|
// PhantomJS (Teaspoons default driver) doesn't have support for
|
||||||
// Function.prototype.bind, which has caused confusion. Use this polyfill to
|
// Function.prototype.bind, which has caused confusion. Use this polyfill to
|
||||||
// avoid the confusion.
|
// avoid the confusion.
|
||||||
|
@ -40,3 +35,8 @@
|
||||||
// instance) you can disable the suite matcher in the configuration and use this
|
// instance) you can disable the suite matcher in the configuration and use this
|
||||||
// file as a manifest.
|
// file as a manifest.
|
||||||
// For more information: http://github.com/modeset/teaspoon
|
// For more information: http://github.com/modeset/teaspoon
|
||||||
|
|
||||||
|
(function() {
|
||||||
|
|
||||||
|
|
||||||
|
}).call(this);
|
||||||
|
|
Loading…
Reference in New Issue