Skip to content

G
gitlab-ce
Commit e7e2f5e3 authored by James Lopez's avatar James Lopez
Browse files
Options

Attempt to fix board_service.js

parent 5752bbab
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/javascripts/boards/services/board_service.js
View file @ e7e2f5e3
...@@ -20,7 +20,6 @@ export default class BoardService { ...@@ -20,7 +20,6 @@ export default class BoardService {
static generateIssuePath(boardId, id) { static generateIssuePath(boardId, id) {
return `${gon.relative_url_root}/-/boards/${boardId ? `${boardId}` : ''}/issues${id ? `/${id}` : ''}`; return `${gon.relative_url_root}/-/boards/${boardId ? `${boardId}` : ''}/issues${id ? `/${id}` : ''}`;
<<<<<<< HEAD
} }
allBoards() { allBoards() {
...@@ -51,8 +50,6 @@ export default class BoardService { ...@@ -51,8 +50,6 @@ export default class BoardService {
deleteBoard({ id }) { deleteBoard({ id }) {
return axios.delete(this.generateBoardsPath(id)); return axios.delete(this.generateBoardsPath(id));
=======
>>>>>>> upstream/master
} }
all() { all() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7