Commit 1bc31259 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'design-management-issue-tab' into 'master'

Added base template for design artifacts

See merge request gitlab-org/gitlab-ee!9632
parents c5e89ca0 4c7da046
- if Feature.enabled?(:versioned_designs)
%ul.nav-tabs.nav.nav-links{ role: 'tablist' }
%li
= link_to '#discussion-tab', class: 'active', id: 'discussion', role: 'tab', 'aria-controls': 'js-discussion', 'aria-selected': 'true', data: { toggle: 'tab', target: '#discussion-tab' } do
= _('Discussion')
%span.badge.badge-pill.js-discussions-count
%li
= link_to '#designs-tab', id: 'designs', role: 'tab', 'aria-controls': 'js-designs', 'aria-selected': 'false', data: { toggle: 'tab', target: '#designs-tab' } do
= _('Designs')
%span.badge.badge-pill.js-designs-count
.tab-content
#discussion-tab.tab-pane.show.active{ role: 'tabpanel', 'aria-labelledby': 'discussion' }
= render_ce 'projects/issues/discussion'
#designs-tab.tab-pane{ role: 'tabpanel', 'aria-labelledby': 'designs' }
= spinner nil, true
- else
= render_ce 'projects/issues/discussion'
......@@ -3300,6 +3300,9 @@ msgstr ""
msgid "Description:"
msgstr ""
msgid "Designs"
msgstr ""
msgid "Destroy"
msgstr ""
......@@ -3378,6 +3381,9 @@ msgstr ""
msgid "Discuss a specific suggestion or question that needs to be resolved"
msgstr ""
msgid "Discussion"
msgstr ""
msgid "Dismiss"
msgstr ""
......
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