From 913857e57765f6911f171fb2fcd12532d6b6f1df Mon Sep 17 00:00:00 2001
From: Jared Deckard <jared.deckard@gmail.com>
Date: Thu, 28 Jul 2016 12:40:17 -0500
Subject: [PATCH] Require comments must be included before code
---
app/assets/javascripts/merge_request_tabs.js | 3 ---
spec/javascripts/spec_helper.js | 10 +++++-----
2 files changed, 5 insertions(+), 8 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);
};
diff --git a/spec/javascripts/spec_helper.js b/spec/javascripts/spec_helper.js
index 9b41242354f..8801c297887 100644
--- a/spec/javascripts/spec_helper.js
+++ b/spec/javascripts/spec_helper.js
@@ -1,8 +1,3 @@
-(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);
--
GitLab