diff options
| author | Phil Hughes <me@iamphill.com> | 2018-04-03 10:59:29 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-04-03 10:59:29 +0100 |
| commit | c0dddb511c3bedc9b07df97739a27e07354b2242 (patch) | |
| tree | 3b1f6042c7fd274579aa82c81a3d5894b6e53d90 /app/assets/javascripts/ide/components/repo_tabs.vue | |
| parent | 6bec91bfc9ec15556e833f4d8f441328d135638e (diff) | |
| parent | 8dca091ff7f04bb92a7835ebeff783b7f0ef76cd (diff) | |
| download | gitlab-ce-c0dddb511c3bedc9b07df97739a27e07354b2242.tar.gz | |
Merge branch 'master' into ide-pending-tab
Diffstat (limited to 'app/assets/javascripts/ide/components/repo_tabs.vue')
| -rw-r--r-- | app/assets/javascripts/ide/components/repo_tabs.vue | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/ide/components/repo_tabs.vue b/app/assets/javascripts/ide/components/repo_tabs.vue index acbb43e867d..7bd646ba9b0 100644 --- a/app/assets/javascripts/ide/components/repo_tabs.vue +++ b/app/assets/javascripts/ide/components/repo_tabs.vue @@ -26,6 +26,11 @@ export default { type: Boolean, required: true, }, + mergeRequestId: { + type: String, + required: false, + default: '', + }, }, data() { return { @@ -70,6 +75,7 @@ export default { :viewer="viewer" :show-shadow="showShadow" :has-changes="hasChanges" + :merge-request-id="mergeRequestId" @click="openFileViewer" /> </div> |