From 3380ee716d00ce65441166f80c2f2c7313da9b9c Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Thu, 23 Mar 2017 01:05:55 -0500
Subject: Fix container issue when switching parallel "Changes" MR tab before
 done loading

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29193
---
 app/assets/javascripts/diff.js | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'app/assets/javascripts/diff.js')

diff --git a/app/assets/javascripts/diff.js b/app/assets/javascripts/diff.js
index 88180149715..5aa3eb46a69 100644
--- a/app/assets/javascripts/diff.js
+++ b/app/assets/javascripts/diff.js
@@ -13,10 +13,6 @@ class Diff {
 
     $diffFile.each((index, file) => new gl.ImageFile(file));
 
-    if (this.diffViewType() === 'parallel') {
-      $('.content-wrapper .container-fluid').removeClass('container-limited');
-    }
-
     if (!isBound) {
       $(document)
         .on('click', '.js-unfold', this.handleClickUnfold.bind(this))
-- 
cgit v1.2.1


From 5bd549187aa68604d320e3d0c1a51ee4ed34c0e3 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Tue, 16 May 2017 15:52:40 -0500
Subject: update remaining uses of CJS syntax to ES module syntax

---
 app/assets/javascripts/diff.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/assets/javascripts/diff.js')

diff --git a/app/assets/javascripts/diff.js b/app/assets/javascripts/diff.js
index 5aa3eb46a69..725ec7b9c70 100644
--- a/app/assets/javascripts/diff.js
+++ b/app/assets/javascripts/diff.js
@@ -1,6 +1,6 @@
 /* eslint-disable class-methods-use-this */
 
-require('./lib/utils/url_utility');
+import './lib/utils/url_utility';
 
 const UNFOLD_COUNT = 20;
 let isBound = false;
-- 
cgit v1.2.1