kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Require comments must be included before code

This commit is contained in:
Jared Deckard 2016-07-28 12:40:17 -05:00
parent 7f6474b269
commit 913857e577
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/merge_request_tabs.js
View File

@ -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);
}; };

10
spec/javascripts/spec_helper.js
View File

@ -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);