Commit d876ba48 authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files

Merge branch 'master' into remove-old-isobject 

* master:
  Fix broken test - load correct data
  Remove redirect for old issue url containing id instead of iid
  Use vue file for table pagination component
  stub error handlers where uncaught Promise rejections currently exist
  Revert "Fix OpenID spec failure that assumed current_sign_in_at would be set"
  Add :redis keyword to some specs clear state of trackable attributes
  Add Repository subnav to 'Find files'
  Make tree, blob and blame pages more consistent
  Fix test failure in job vue componenFix test failure in job vue componentt
  Add German translation for Cycle Analytics (!11161)
  Adds left connector class to the rendered graph
parents 31dda048 09c2aab4

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

+4 −1
Original line number Diff line number Diff line
@@ -35,7 +35,10 @@ gl.issueBoards.Board = Vue.extend({ 
    filter: {

      handler() {

        this.list.page = 1;

        this.list.getIssues(true);

        this.list.getIssues(true)

          .catch(() => {

            // TODO: handle request error

          });

      },

      deep: true,

    },

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

+4 −1
Original line number Diff line number Diff line
@@ -70,7 +70,10 @@ export default { 


            list.id = listObj.id;

            list.label.id = listObj.label.id;

            list.getIssues();

            list.getIssues()

              .catch(() => {

                // TODO: handle request error

              });

          });

        })

        .catch(() => {

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

+4 −1
Original line number Diff line number Diff line
@@ -90,7 +90,10 @@ export default { 
        if (this.scrollHeight() <= this.listHeight() &&

          this.list.issuesSize > this.list.issues.length) {

          this.list.page += 1;

          this.list.getIssues(false);

          this.list.getIssues(false)

            .catch(() => {

              // TODO: handle request error

            });

        }



        if (this.scrollHeight() > Math.ceil(this.listHeight())) {

app/assets/javascripts/boards/components/modal/index.js

+2 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ gl.issueBoards.IssuesModal = Vue.extend({ 
        if (!this.issuesCount) {

          this.issuesCount = data.size;

        }

      }).catch(() => {

        // TODO: handle request error

      });

    },

  },

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

+19 −5
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ class List { 
    }



    if (this.type !== 'blank' && this.id) {

      this.getIssues();

      this.getIssues().catch(() => {

        // TODO: handle request error

      });

    }

  }
@@ -52,11 +54,17 @@ class List { 
    gl.issueBoards.BoardsStore.state.lists.splice(index, 1);

    gl.issueBoards.BoardsStore.updateNewListDropdown(this.id);



    gl.boardService.destroyList(this.id);

    gl.boardService.destroyList(this.id)

      .catch(() => {

        // TODO: handle request error

      });

  }



  update () {

    gl.boardService.updateList(this.id, this.position);

    gl.boardService.updateList(this.id, this.position)

      .catch(() => {

        // TODO: handle request error

      });

  }



  nextPage () {
@@ -146,11 +154,17 @@ class List { 
    this.issues.splice(oldIndex, 1);

    this.issues.splice(newIndex, 0, issue);



    gl.boardService.moveIssue(issue.id, null, null, moveBeforeIid, moveAfterIid);

    gl.boardService.moveIssue(issue.id, null, null, moveBeforeIid, moveAfterIid)

      .catch(() => {

        // TODO: handle request error

      });

  }



  updateIssueLabel(issue, listFrom, moveBeforeIid, moveAfterIid) {

    gl.boardService.moveIssue(issue.id, listFrom.id, this.id, moveBeforeIid, moveAfterIid);

    gl.boardService.moveIssue(issue.id, listFrom.id, this.id, moveBeforeIid, moveAfterIid)

      .catch(() => {

        // TODO: handle request error

      });

  }



  findIssue (id) {