diff options
| author | Phil Hughes <me@iamphill.com> | 2017-04-13 18:49:31 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-04-13 18:49:31 +0100 |
| commit | 9ee1e2a6623d57ef23430423e38c0f94959353ce (patch) | |
| tree | ba424ad55c76bc6853aa6d4e5b000a1afdd176dc | |
| parent | eeda98734ea28954fbe0aa1b22bf11177831f4b6 (diff) | |
| download | gitlab-ce-board-component-in-js.tar.gz | |
Fixed another weird conflict resolutionboard-component-in-js
| -rw-r--r-- | app/assets/javascripts/boards/components/issue_card_inner.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/boards/components/issue_card_inner.js b/app/assets/javascripts/boards/components/issue_card_inner.js index eeff4978825..2becced2712 100644 --- a/app/assets/javascripts/boards/components/issue_card_inner.js +++ b/app/assets/javascripts/boards/components/issue_card_inner.js @@ -6,6 +6,10 @@ window.gl.issueBoards = window.gl.issueBoards || {}; gl.issueBoards.IssueCardInner = Vue.extend({ props: { + issue: { + type: Object, + required: true, + }, issueLinkBase: { type: String, required: true, |