added editor options to redcue EE conflicts

app/assets/javascripts/repo/lib/editor.js

@@ -2,6 +2,7 @@ import DecorationsController from './decorations/controller';
 import DirtyDiffController from './diff/controller';
 import Disposable from './common/disposable';
 import ModelManager from './common/model_manager';
+import editorOptions from './editor_options';
 
 export default class Editor {
   static create(monaco) {
@@ -49,6 +50,15 @@ export default class Editor {
 
     this.currentModel = model;
 
+    this.instance.updateOptions(editorOptions.reduce((acc, obj) => {
+      Object.keys(obj).forEach((key) => {
+        Object.assign(acc, {
+          [key]: obj[key](model),
+        });
+      });
+      return acc;
+    }, {}));
+
     this.dirtyDiffController.reDecorate(model);
   }
 

app/assets/javascripts/repo/lib/editor_options.js

+export default [{
+}];

spec/javascripts/repo/lib/editor_options_spec.js

+import editorOptions from '~/repo/lib/editor_options';
+
+describe('Multi-file editor library editor options', () => {
+  it('returns an array', () => {
+    expect(editorOptions).toEqual(jasmine.any(Array));
+  });
+});