Merge branch 'ide' of gitlab.com:gitlab-org/gitlab-ce into ide

app/assets/javascripts/gl_dropdown.js

-/* eslint-disable func-names, space-before-function-paren, no-var, one-var, one-var-declaration-per-line, prefer-rest-params, max-len, vars-on-top, wrap-iife, no-unused-vars, quotes, no-shadow, no-cond-assign, prefer-arrow-callback, no-return-assign, no-else-return, camelcase, comma-dangle, no-lonely-if, guard-for-in, no-restricted-syntax, consistent-return, prefer-template, no-param-reassign, no-loop-func, no-mixed-operators */
+/* eslint-disable func-names, no-underscore-dangle, space-before-function-paren, no-var, one-var, one-var-declaration-per-line, prefer-rest-params, max-len, vars-on-top, wrap-iife, no-unused-vars, quotes, no-shadow, no-cond-assign, prefer-arrow-callback, no-return-assign, no-else-return, camelcase, comma-dangle, no-lonely-if, guard-for-in, no-restricted-syntax, consistent-return, prefer-template, no-param-reassign, no-loop-func, no-mixed-operators */
 /* global fuzzaldrinPlus */
 import { isObject } from './lib/utils/type_utility';
 

app/assets/javascripts/repo/index.js

@@ -37,14 +37,12 @@ function addEventsForNonVueEls() {
     Store.targetBranch = $('.project-refs-target-form input[name="ref"]').val();
   });
 
-  window.onbeforeunload = function (e) {
+  window.onbeforeunload = function confirmUnload(e) {
     const hasChanged = Store.openedFiles
       .some(file => file.changed);
-    if (!hasChanged) return;
-    e = e || window.event;
-    if (e) {
-      e.returnValue = 'Are you sure you want to lose unsaved changes?';
-    }
+    if (!hasChanged) return undefined;
+    const event = e || window.event;
+    if (event) event.returnValue = 'Are you sure you want to lose unsaved changes?';
     // For Safari
     return 'Are you sure you want to lose unsaved changes?';
   };

app/assets/javascripts/repo/repo_binary_viewer.vue

@@ -31,7 +31,7 @@ const RepoBinaryViewer = {
     },
 
     getBinaryType() {
-      if (this.binaryTypes.hasOwnProperty(this.activeFile.extension)) {
+      if (Object.hasOwnProperty.call(this.binaryTypes, this.activeFile.extension)) {
         return this.activeFile.extension;
       }
       return 'unknown';

app/assets/javascripts/repo/repo_commit_section.vue

@@ -26,14 +26,11 @@ const RepoCommitSection = {
       // see https://docs.gitlab.com/ce/api/commits.html#create-a-commit-with-multiple-files-and-actions
       const branch = Helper.getBranch();
       const commitMessage = this.commitMessage;
-      const actions = this.changedFiles.map((f) => {
-        const filePath = Helper.getFilePathFromFullPath(f.url, branch);
-        return {
+      const actions = this.changedFiles.map(f => ({
         action: 'update',
         file_path: Helper.getFilePathFromFullPath(f.url, branch),
         content: f.newContent,
-        };
-      });
+      }));
       const payload = {
         branch: Store.targetBranch,
         commit_message: commitMessage,

app/assets/javascripts/repo/repo_editor.vue

@@ -88,13 +88,16 @@ const RepoEditor = {
     dialog: {
       handler(obj) {
         if (obj.status) {
-          obj.status = false;
-          this.openedFiles.map((f) => {
+          obj.status = false; // eslint-disable-line no-param-reassign
+          this.openedFiles.map((file) => {
+            const f = file;
             if (f.active) {
               this.blobRaw = f.plain;
             }
             f.changed = false;
             delete f.newContent;
+
+            return f;
           });
           this.editMode = false;
         }

app/assets/javascripts/repo/repo_store.js

@@ -59,10 +59,9 @@ const RepoStore = {
   readOnly: true,
 
   resetBinaryTypes() {
-    let s = '';
-    for (s in RepoStore.binaryTypes) {
-      RepoStore.binaryTypes[s] = false;
-    }
+    Object.keys(RepoStore.binaryTypes).forEach((key) => {
+      RepoStore.binaryTypes[key] = false;
+    });
   },
 
   // mutations

spec/javascripts/repo/repo_commit_section_spec.js

@@ -42,7 +42,9 @@ describe('RepoCommitSection', () => {
     expect(changedFiles.length).toEqual(2);
 
     changedFiles.forEach((changedFile, i) => {
-      expect(changedFile.textContent).toEqual(RepoHelper.getFilePathFromFullPath(openedFiles[i].url, branch));
+      const filePath = RepoHelper.getFilePathFromFullPath(openedFiles[i].url, branch);
+
+      expect(changedFile.textContent).toEqual(filePath);
     });
 
     expect(commitMessage.tagName).toEqual('TEXTAREA');