resolve some boards conflicts

app/assets/javascripts/boards/boards_bundle.js

@@ -76,7 +76,6 @@ $(() => {
       },
     },
     created () {
-<<<<<<< HEAD
       if (this.milestoneTitle) {
         const milestoneTitleParam = `milestone_title=${this.milestoneTitle}`;
 
@@ -86,15 +85,6 @@ $(() => {
 
         Store.updateFiltersUrl(true);
       }
-=======
-      gl.boardService = new BoardService({
-        boardsEndpoint: this.boardsEndpoint,
-        listsEndpoint: this.listsEndpoint,
-        bulkUpdatePath: this.bulkUpdatePath,
-        boardId: this.boardId,
-      });
-      Store.rootPath = this.boardsEndpoint;
->>>>>>> upstream/master
 
       gl.boardService = new BoardService({
         boardsEndpoint: this.boardsEndpoint,
@@ -148,10 +138,7 @@ $(() => {
     el: document.getElementById('js-add-list'),
     data: {
       filters: Store.state.filters,
-<<<<<<< HEAD
       milestoneTitle: $boardApp.dataset.boardMilestoneTitle,
-=======
->>>>>>> upstream/master
     },
     mounted () {
       gl.issueBoards.newListDropdownInit();
@@ -165,7 +152,6 @@ $(() => {
       return {
         modal: ModalStore.store,
         store: Store.state,
-<<<<<<< HEAD
         isFullscreen: false,
         focusModeAvailable: gl.utils.convertPermissionToBoolean(
           $boardApp.dataset.focusModeAvailable,
@@ -173,8 +159,6 @@ $(() => {
         canAdminList: this.$options.el && gl.utils.convertPermissionToBoolean(
           this.$options.el.dataset.canAdminList,
         ),
-=======
->>>>>>> upstream/master
       };
     },
     watch: {
@@ -228,15 +212,11 @@ $(() => {
           :class="{ 'disabled': disabled }"
           :title="tooltipTitle"
           :aria-disabled="disabled"
-<<<<<<< HEAD
           v-if="canAdminList"
-=======
->>>>>>> upstream/master
           @click="openModal">
           Add issues
         </button>
       </div>
-<<<<<<< HEAD
     `,
   });
 
@@ -277,8 +257,6 @@ $(() => {
           </span>
         </a>
       </div>
-=======
->>>>>>> upstream/master
     `,
   });
 

app/assets/javascripts/boards/components/board_list.js

@@ -82,11 +82,7 @@ export default {
       this.showIssueForm = !this.showIssueForm;
     },
     onScroll() {
-<<<<<<< HEAD
       if (!this.list.loadingMore && (this.scrollTop() > this.scrollHeight() - this.scrollOffset)) {
-=======
-      if (!this.loadingMore && (this.scrollTop() > this.scrollHeight() - this.scrollOffset)) {
->>>>>>> upstream/master
         this.loadNextPage();
       }
     },
@@ -176,11 +172,8 @@ export default {
         <loading-icon />
       </div>
       <board-new-issue
-<<<<<<< HEAD
         key="newIssue"
         :group-id="groupId"
-=======
->>>>>>> upstream/master
         :list="list"
         v-if="list.type !== 'closed' && showIssueForm"/>
       <ul

app/assets/javascripts/boards/components/board_new_issue.js

@@ -7,14 +7,11 @@ const Store = gl.issueBoards.BoardsStore;
 export default {
   name: 'BoardNewIssue',
   props: {
-<<<<<<< HEAD
     groupId: {
       type: Number,
       required: false,
       default: 0,
     },
-=======
->>>>>>> upstream/master
     list: {
       type: Object,
       required: true,

app/assets/javascripts/boards/components/issue_card_inner.js

@@ -68,7 +68,6 @@ gl.issueBoards.IssueCardInner = Vue.extend({
       return this.issue.assignees.length > this.numberOverLimit;
     },
     cardUrl() {
-<<<<<<< HEAD
       let baseUrl = this.issueLinkBase;
 
       if (this.groupId && this.issue.project) {
@@ -76,9 +75,6 @@ gl.issueBoards.IssueCardInner = Vue.extend({
       }
 
       return `${baseUrl}/${this.issue.iid}`;
-=======
-      return `${this.issueLinkBase}/${this.issue.iid}`;
->>>>>>> upstream/master
     },
     issueId() {
       if (this.issue.iid) {

app/assets/javascripts/boards/components/sidebar/remove_issue.js

@@ -25,11 +25,7 @@ gl.issueBoards.RemoveIssueBtn = Vue.extend({
   },
   computed: {
     updateUrl() {
-<<<<<<< HEAD
       return this.issueUpdate.replace(':project_path', this.issue.project.path);
-=======
-      return this.issueUpdate;
->>>>>>> upstream/master
     },
   },
   methods: {
@@ -48,14 +44,11 @@ gl.issueBoards.RemoveIssueBtn = Vue.extend({
           label_ids: labelIds,
         },
       };
-<<<<<<< HEAD
       if (Store.state.currentBoard.milestone_id) {
         data.issue.milestone_id = -1;
       }
 
       // Post the remove data
-=======
->>>>>>> upstream/master
       Vue.http.patch(this.updateUrl, data).catch(() => {
         new Flash('Failed to remove issue from board, please try again.', 'alert');
 

app/assets/javascripts/boards/models/list.js

@@ -112,10 +112,7 @@ class List {
       .then((data) => {
         issue.id = data.id;
         issue.iid = data.iid;
-<<<<<<< HEAD
         issue.milestone = data.milestone;
-=======
->>>>>>> upstream/master
         issue.project = data.project;
 
         if (this.issuesSize > 1) {

app/helpers/boards_helper.rb

 module BoardsHelper
-<<<<<<< HEAD
   prepend EE::BoardsHelper
 
-=======
->>>>>>> upstream/master
   def board
     @board ||= @board || @boards.first
   end

app/views/shared/boards/_show.html.haml

 - board = local_assigns.fetch(:board, nil)
 - @no_breadcrumb_container = true
 - @no_container = true
-<<<<<<< HEAD:app/views/shared/boards/_show.html.haml
 - @content_class = "issue-boards-content js-focus-mode-board"
 - breadcrumb_title "Issue Boards"
 - page_title "Boards"
 
 - add_to_breadcrumbs("Issues", @issues_path)
 
-=======
-- @content_class = "issue-boards-content"
-- breadcrumb_title "Issue Board"
-- page_title "Boards"
-
->>>>>>> upstream/master:app/views/shared/boards/_show.html.haml
 - content_for :page_specific_javascripts do
   = webpack_bundle_tag 'common_vue'
   = webpack_bundle_tag 'filtered_search'
@@ -45,7 +38,6 @@
       ":board-id" => "boardId",
       ":key" => "_uid" }
   = render "shared/boards/components/sidebar"
-<<<<<<< HEAD:app/views/shared/boards/_show.html.haml
   - if @project
     %board-add-issues-modal{ "blank-state-image" => render('shared/empty_states/icons/issues.svg'),
       "new-issue-path" => new_project_issue_path(@project),
@@ -54,12 +46,3 @@
       ":issue-link-base" => "issueLinkBase",
       ":root-path" => "rootPath",
       ":project-id" => @project.try(:id) }
-=======
-  %board-add-issues-modal{ "blank-state-image" => render('shared/empty_states/icons/issues.svg'),
-    "new-issue-path" => new_project_issue_path(@project),
-    "milestone-path" => milestones_filter_dropdown_path,
-    "label-path" => labels_filter_path,
-    ":issue-link-base" => "issueLinkBase",
-    ":root-path" => "rootPath",
-    ":project-id" => @project.try(:id) }
->>>>>>> upstream/master:app/views/shared/boards/_show.html.haml

app/views/shared/boards/components/_board.html.haml

@@ -14,26 +14,16 @@
         %span.has-tooltip{ "v-if": "list.type === \"label\"",
           ":title" => '(list.label ? list.label.description : "")',
           data: { container: "body", placement: "bottom" },
-<<<<<<< HEAD:app/views/shared/boards/components/_board.html.haml
-          class: " label color-label title board-title-text",
-=======
           class: "label color-label title board-title-text",
->>>>>>> upstream/master:app/views/shared/boards/components/_board.html.haml
           ":style" => "{ backgroundColor: (list.label && list.label.color ? list.label.color : null), color: (list.label && list.label.color ? list.label.text_color : \"#2e2e2e\") }" }
           {{ list.title }}
         - if can?(current_user, :admin_list, current_board_parent)
           %board-delete{ "inline-template" => true,
             ":list" => "list",
             "v-if" => "!list.preset && list.id" }
-<<<<<<< HEAD:app/views/shared/boards/components/_board.html.haml
             %button.board-delete.has-tooltip.append-right-10{ type: "button", title: "Delete list", "aria-label" => "Delete list", data: { placement: "bottom" }, "@click.stop" => "deleteBoard" }
               = icon("trash")
         .issue-count-badge.clearfix{ "v-if" => 'list.type !== "blank" && list.type !== "promotion"' }
-=======
-            %button.board-delete.has-tooltip.pull-right{ type: "button", title: "Delete list", "aria-label" => "Delete list", data: { placement: "bottom" }, "@click.stop" => "deleteBoard" }
-              = icon("trash")
-        .issue-count-badge.clearfix{ "v-if" => 'list.type !== "blank"' }
->>>>>>> upstream/master:app/views/shared/boards/components/_board.html.haml
           %span.issue-count-badge-count.pull-left{ ":class" => '{ "has-btn": list.type !== "closed" && !disabled }' }
             {{ list.issuesSize }}
           - if can?(current_user, :admin_list, current_board_parent)
@@ -44,12 +34,7 @@
               "title" => "New issue",
               data: { placement: "top", container: "body" } }
               = icon("plus", class: "js-no-trigger-collapse")
-<<<<<<< HEAD:app/views/shared/boards/components/_board.html.haml
     %board-list{ "v-if" => 'list.type !== "blank" && list.type !== "promotion"',
-=======
-
-    %board-list{ "v-if" => 'list.type !== "blank"',
->>>>>>> upstream/master:app/views/shared/boards/components/_board.html.haml
       ":list" => "list",
       ":issues" => "list.issues",
       ":loading" => "list.loading",

app/views/shared/boards/components/sidebar/_due_date.html.haml

@@ -10,11 +10,7 @@
         No due date
       %span.bold{ "v-if" => "issue.dueDate" }
         {{ issue.dueDate | due-date }}
-<<<<<<< HEAD:app/views/shared/boards/components/sidebar/_due_date.html.haml
-      - if can?(current_user, :admin_issue, current_board_parent)
-=======
       - if can_admin_issue?
->>>>>>> upstream/master:app/views/shared/boards/components/sidebar/_due_date.html.haml
         %span.no-value.js-remove-due-date-holder{ "v-if" => "issue.dueDate" }
           \-
           %a.js-remove-due-date{ href: "#", role: "button" }

app/views/shared/issuable/_search_bar.html.haml

@@ -126,13 +126,7 @@
           - if type == :boards
             - if can?(current_user, :admin_list, board.parent)
               .dropdown.prepend-left-10#js-add-list
-<<<<<<< HEAD
-
-                %button.btn.btn-create.btn-inverted.js-new-board-list{ type: "button", data: board_list_data }
-
-=======
                 %button.btn.btn-create.btn-inverted.js-new-board-list{ type: "button", data: board_list_data }
->>>>>>> upstream/master
                   Add list
                 .dropdown-menu.dropdown-menu-paging.dropdown-menu-align-right.dropdown-menu-issues-board-new.dropdown-menu-selectable
                   = render partial: "shared/issuable/label_page_default", locals: { show_footer: true, show_create: true, show_boards_content: true, title: "Add list" }

spec/javascripts/boards/issue_card_spec.js

@@ -293,16 +293,11 @@ describe('Issue card component', () => {
           ).toBe(2);
           expect(
             component.$el.textContent,
-<<<<<<< HEAD
-          ).not.toContain('Closed');
-=======
           ).not.toContain('closed');
->>>>>>> upstream/master
 
           done();
         })
         .catch(done.fail);
-<<<<<<< HEAD
     });
 
     it('shows group labels on group boards', (done) => {
@@ -347,8 +342,6 @@ describe('Issue card component', () => {
           done();
         })
         .catch(done.fail);
-=======
->>>>>>> upstream/master
     });
   });
 });

spec/javascripts/boards/list_spec.js

@@ -123,11 +123,7 @@ describe('List model', () => {
         list.issues.push(new ListIssue({
           title: 'Testing',
           id: _.random(10000) + i,
-<<<<<<< HEAD
-          iid: _.random(1000) + i,
-=======
           iid: _.random(10000) + i,
->>>>>>> upstream/master
           confidential: false,
           labels: [list.label],
           assignees: [],

spec/javascripts/boards/mock_data.js

@@ -43,15 +43,11 @@ const BoardsMockData = {
         labels: [],
         assignees: [],
       }],
-<<<<<<< HEAD
     },
     '/test/issue-boards/milestones.json': [{
       id: 1,
       title: 'test',
     }],
-=======
-    }
->>>>>>> upstream/master
   },
   'POST': {
     '/test/boards/1{/id}': listObj
@@ -86,10 +82,7 @@ const mockBoardService = (opts = {}) => {
   });
 };
 
-<<<<<<< HEAD
 window.boardObj = boardObj;
-=======
->>>>>>> upstream/master
 window.listObj = listObj;
 window.listObjDuplicate = listObjDuplicate;
 window.BoardsMockData = BoardsMockData;

spec/javascripts/boards/modal_store_spec.js

@@ -26,11 +26,7 @@ describe('Modal store', () => {
     });
     issue2 = new ListIssue({
       title: 'Testing',
-<<<<<<< HEAD
       id: 2,
-=======
-      id: 1,
->>>>>>> upstream/master
       iid: 2,
       confidential: false,
       labels: [],