Merge branch 'mr-file-tree-inline-fluid-width-fix' into 'master'

Fixed merge request fill tree not respecting fluid width

Closes #52916

See merge request gitlab-org/gitlab-ce!22487

Author: Filipa Lacerda

app/assets/javascripts/merge_request_tabs.js

@@ -419,7 +419,7 @@ export default class MergeRequestTabs {
     if (this.diffViewType() === 'parallel' || removeLimited) {
       $wrapper.removeClass('container-limited');
     } else {
-      $wrapper.addClass('container-limited');
+      $wrapper.toggleClass('container-limited', this.fixedLayoutPref);
     }
   }
 

changelogs/unreleased/mr-file-tree-inline-fluid-width-fix.yml

@@ -0,0 +1,5 @@
+---
+title: Fixed merge request fill tree toggling not respecting fluid width preference
+merge_request:
+author:
+type: fixed

spec/javascripts/merge_request_tabs_spec.js

@@ -224,6 +224,14 @@ describe('MergeRequestTabs', function() {
       expect($('.content-wrapper')).not.toContainElement('.container-limited');
     });
 
+    it('does not add container-limited when fluid layout is prefered', function() {
+      $('.content-wrapper .container-fluid').removeClass('container-limited');
+
+      this.class.expandViewContainer(false);
+
+      expect($('.content-wrapper')).not.toContainElement('.container-limited');
+    });
+
     it('does remove container-limited from breadcrumbs', function() {
       $('.container-limited').addClass('breadcrumbs');
       this.class.expandViewContainer();