diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-21 15:09:07 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-21 15:09:07 +0300 |
| commit | fbc1f4ffc29ae99f438b07872c3c00fbe7651caa (patch) | |
| tree | 8d82cc8f4037880ebd6fedee1952b48784a634ee /app/assets/javascripts/issues | |
| parent | ff2606426b46aa3c5ea9fb18a6d0ce7c38aed183 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/issues')
| -rw-r--r-- | app/assets/javascripts/issues/list/components/issues_list_app.vue | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/javascripts/issues/list/components/issues_list_app.vue b/app/assets/javascripts/issues/list/components/issues_list_app.vue index ce1af75d671..eb1c17ba7e5 100644 --- a/app/assets/javascripts/issues/list/components/issues_list_app.vue +++ b/app/assets/javascripts/issues/list/components/issues_list_app.vue @@ -173,6 +173,11 @@ export default { required: false, default: () => [], }, + eeIsOkrsEnabled: { + type: Boolean, + required: false, + default: () => false, + }, }, data() { return { @@ -840,9 +845,14 @@ export default { > {{ $options.i18n.editIssues }} </gl-button> - <gl-button v-if="showNewIssueLink" :href="newIssuePath" variant="confirm"> + <gl-button + v-if="showNewIssueLink && !eeIsOkrsEnabled" + :href="newIssuePath" + variant="confirm" + > {{ $options.i18n.newIssueLabel }} </gl-button> + <slot name="new-objective-button"></slot> <new-issue-dropdown v-if="showNewIssueDropdown" /> </template> |