Merge branch 'ce_upstream' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream

.eslintrc

@@ -17,7 +17,7 @@
     "spyOn": false,
     "spyOnEvent": false,
     "Turbolinks": false,
-    "window": false
+    "window": false,
+    "Vue": false
   }
 }
-

app/assets/javascripts/admin_email_select.js

+/* eslint-disable */
 (function() {
   var slice = [].slice;
 

app/assets/javascripts/appearances.js

-(function() {
-
-
-}).call(this);

app/assets/javascripts/application_settings.js.es6

+/* eslint-disable */
 (global => {
   global.gl = global.gl || {};
 

app/assets/javascripts/approvals.js

+/* eslint-disable */
 (function() {
   $(function() {
     $(".approver-list").on("click", ".unsaved-approvers.approver .btn-remove", function(ev) {

app/assets/javascripts/boards/components/board_new_form.js.es6

@@ -7,32 +7,32 @@
       type: String,
       currentBoard: Object,
       currentPage: String,
-      reload: Boolean
+      reload: Boolean,
     },
-    data () {
+    data() {
       return {
         board: {
           id: false,
-          name: ''
-        }
+          name: '',
+        },
       };
     },
-    ready () {
+    ready() {
       if (this.currentBoard && Object.keys(this.currentBoard).length) {
         this.board = Vue.util.extend({}, this.currentBoard);
       }
     },
     computed: {
-      buttonText () {
+      buttonText() {
         if (this.type === 'new') {
           return 'Create';
-        } else {
-          return 'Save';
         }
-      }
+
+        return 'Save';
+      },
     },
     methods: {
-      submit () {
+      submit() {
         gl.boardService.createBoard(this.board)
           .then(() => {
             if (this.currentBoard) {
@@ -46,7 +46,7 @@
             this.currentPage = '';
             this.reload = true;
           });
-      }
-    }
+      },
+    },
   });
 })();

app/assets/javascripts/boards/components/boards_selector.js.es6

@@ -6,23 +6,23 @@
 
   gl.issueBoards.BoardsSelector = Vue.extend({
     components: {
-      'board-selector-form': gl.issueBoards.BoardSelectorForm
+      'board-selector-form': gl.issueBoards.BoardSelectorForm,
     },
     props: {
       currentBoard: Object,
-      endpoint: String
+      endpoint: String,
     },
-    data () {
+    data() {
       return {
         open: false,
         loading: true,
         boards: [],
         currentPage: '',
-        reload: false
+        reload: false,
       };
     },
     watch: {
-      reload () {
+      reload() {
         if (this.reload) {
           this.boards = [];
           this.loading = true;
@@ -30,32 +30,32 @@
 
           this.loadBoards(false);
         }
-      }
+      },
     },
     computed: {
-      showDelete () {
+      showDelete() {
         return this.boards.length > 1;
       },
-      title () {
+      title() {
         if (this.currentPage === 'edit') {
           return 'Edit board';
         } else if (this.currentPage === 'new') {
           return 'Create new board';
         } else if (this.currentPage === 'delete') {
           return 'Delete board';
-        } else {
-          return 'Go to a board';
         }
-      }
+
+        return 'Go to a board';
+      },
     },
     methods: {
-      showPage (page) {
+      showPage(page) {
         this.currentPage = page;
       },
-      toggleDropdown () {
+      toggleDropdown() {
         this.open = !this.open;
       },
-      loadBoards (toggleDropdown = true) {
+      loadBoards(toggleDropdown = true) {
         if (toggleDropdown) {
           this.toggleDropdown();
         }
@@ -66,7 +66,7 @@
             this.boards = resp.json();
           });
         }
-      }
-    }
+      },
+    },
   });
 })();

app/assets/javascripts/ldap_groups_select.js

+/* eslint-disable */
 (function() {
   $(function() {
     var groupFormatSelection, ldapGroupResult;

app/assets/javascripts/path_locks.js

+/* eslint-disable */
 (function() {
   this.PathLocks = (function() {
     function PathLocks() {}

app/assets/javascripts/weight_select.js

+/* eslint-disable */
 (function() {
   this.WeightSelect = (function() {
     function WeightSelect() {

app/views/projects/boards/index.html.haml

@@ -10,18 +10,10 @@
 
 = render 'shared/issuable/filter', type: :boards
 
-<<<<<<< HEAD
-#board-app{ "v-cloak" => true, data: board_data }
-  = render "title", board: @boards.first
-  .boards-app-loading.text-center{ "v-if" => "loading" }
-    = icon("spinner spin")
-  .boards-list
-    = render "projects/boards/components/board"
-=======
 #board-app.boards-app{ "v-cloak" => true, data: board_data }
+  = render "title", board: @boards.first
   .boards-list{ ":class" => "{ 'is-compact': detailIssueVisible }" }
     .boards-app-loading.text-center{ "v-if" => "loading" }
       = icon("spinner spin")
     = render "projects/boards/components/board"
   = render "projects/boards/components/sidebar"
->>>>>>> 144358e98ee1b25b61854a3471e21e100ace9db5

app/views/projects/boards/show.html.haml

@@ -10,18 +10,10 @@
 
 = render 'shared/issuable/filter', type: :boards
 
-<<<<<<< HEAD
-#board-app{ "v-cloak" => true, data: board_data }
-  = render "title", board: @board
-  .boards-app-loading.text-center{ "v-if" => "loading" }
-    = icon("spinner spin")
-  .boards-list
-    = render "projects/boards/components/board"
-=======
 #board-app.boards-app{ "v-cloak" => true, data: board_data }
+  = render "title", board: @board
   .boards-list{ ":class" => "{ 'is-compact': detailIssueVisible }" }
     .boards-app-loading.text-center{ "v-if" => "loading" }
       = icon("spinner spin")
     = render "projects/boards/components/board"
   = render "projects/boards/components/sidebar"
->>>>>>> 144358e98ee1b25b61854a3471e21e100ace9db5