diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-18 00:08:34 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-18 00:08:34 +0000 |
| commit | d963ae70e2b8520f22733351e76b3845035ec755 (patch) | |
| tree | efeedd53f1e922c71cb25be2fac09642264e9de8 /app | |
| parent | 9613d93025008a5326ddb624e2909feaa87e7977 (diff) | |
| download | gitlab-ce-d963ae70e2b8520f22733351e76b3845035ec755.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/issues/show/components/app.vue | 7 | ||||
| -rw-r--r-- | app/assets/javascripts/issues/show/index.js | 2 | ||||
| -rw-r--r-- | app/helpers/issuables_helper.rb | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/javascripts/issues/show/components/app.vue b/app/assets/javascripts/issues/show/components/app.vue index 5c4aae45ef2..c664135f30e 100644 --- a/app/assets/javascripts/issues/show/components/app.vue +++ b/app/assets/javascripts/issues/show/components/app.vue @@ -531,8 +531,11 @@ export default { <div class="issue-sticky-header-text gl-display-flex gl-align-items-center gl-mx-auto gl-px-5" > - <gl-badge :icon="statusIcon" :variant="statusVariant" class="gl-mr-2" - ><span class="gl-display-none gl-sm-display-block">{{ statusText }}</span></gl-badge + <gl-badge :variant="statusVariant" class="gl-mr-2"> + <gl-icon :name="statusIcon" /> + <span class="gl-display-none gl-sm-display-block gl-ml-2">{{ + statusText + }}</span></gl-badge > <span v-if="isLocked" data-testid="locked" class="issuable-warning-icon"> <gl-icon name="lock" :aria-label="__('Locked')" /> diff --git a/app/assets/javascripts/issues/show/index.js b/app/assets/javascripts/issues/show/index.js index 4a5ebf9615b..6b0b26ef2e3 100644 --- a/app/assets/javascripts/issues/show/index.js +++ b/app/assets/javascripts/issues/show/index.js @@ -38,6 +38,7 @@ export function initIncidentApp(issueData = {}) { projectId, slaFeatureAvailable, uploadMetricsFeatureAvailable, + state, } = issueData; const fullPath = `${projectNamespace}/${projectPath}`; @@ -60,6 +61,7 @@ export function initIncidentApp(issueData = {}) { return createElement(IssueApp, { props: { ...issueData, + issuableStatus: state, descriptionComponent: IncidentTabs, showTitleBorder: false, }, diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 1bd27158be4..486d5bb3866 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -238,6 +238,7 @@ module IssuablesHelper markdownPreviewPath: preview_markdown_path(parent, target_type: issuable.model_name, target_id: issuable.iid), markdownDocsPath: help_page_path('user/markdown'), lockVersion: issuable.lock_version, + state: issuable.state, issuableTemplateNamesPath: template_names_path(parent, issuable), initialTitleHtml: markdown_field(issuable, :title), initialTitleText: issuable.title, |