diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-29 00:09:37 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-29 00:09:37 +0000 |
| commit | 937f82e11fe1d3970ea3e1f281185e91d8f5102e (patch) | |
| tree | 9c69e19144f2f9d7d5119496f468aea4f1538137 /app/assets/javascripts | |
| parent | 583fadea8d738850cbd83dcde1118d3fc3462d61 (diff) | |
| download | gitlab-ce-937f82e11fe1d3970ea3e1f281185e91d8f5102e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts')
3 files changed, 15 insertions, 5 deletions
diff --git a/app/assets/javascripts/incidents/components/incidents_list.vue b/app/assets/javascripts/incidents/components/incidents_list.vue index c1a73ba56f7..4cd86c4b8b9 100644 --- a/app/assets/javascripts/incidents/components/incidents_list.vue +++ b/app/assets/javascripts/incidents/components/incidents_list.vue @@ -9,6 +9,7 @@ import { GlTooltipDirective, GlButton, GlSearchBoxByType, + GlIcon, } from '@gitlab/ui'; import { debounce } from 'lodash'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; @@ -55,6 +56,7 @@ export default { GlButton, TimeAgoTooltip, GlSearchBoxByType, + GlIcon, }, directives: { GlTooltip: GlTooltipDirective, @@ -164,7 +166,15 @@ export default { @row-clicked="navigateToIncidentDetails" > <template #cell(title)="{ item }"> - <div class="gl-max-w-full text-truncate" :title="item.title">{{ item.title }}</div> + <div class="gl-display-flex gl-justify-content-center"> + <div class="gl-max-w-full text-truncate" :title="item.title">{{ item.title }}</div> + <gl-icon + v-if="item.state === 'closed'" + name="issue-close" + class="gl-fill-blue-500" + data-testid="incident-closed" + /> + </div> </template> <template #cell(createdAt)="{ item }"> diff --git a/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql b/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql index e025a764c34..eeba60139ca 100644 --- a/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql +++ b/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql @@ -10,6 +10,7 @@ query getIncidents( iid title createdAt + state labels { nodes { title diff --git a/app/assets/javascripts/jira_import/components/jira_import_form.vue b/app/assets/javascripts/jira_import/components/jira_import_form.vue index 24bfb49a7d1..eb72e8581e8 100644 --- a/app/assets/javascripts/jira_import/components/jira_import_form.vue +++ b/app/assets/javascripts/jira_import/components/jira_import_form.vue @@ -189,11 +189,10 @@ export default { <p> {{ __( - `Jira users have been matched with similar GitLab users. - This can be overwritten by selecting a GitLab user from the dropdown in the "GitLab + `Jira users have been imported from the configured Jira instance. + They can be mapped by selecting a GitLab user from the dropdown in the "GitLab username" column. - If it wasn't possible to match a Jira user with a GitLab user, the dropdown defaults to - the user conducting the import.`, + When the form appears, the dropdown defaults to the user conducting the import.`, ) }} </p> |