Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-06 15:09:59 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-06 15:09:59 +0300
commitc737c54ea26dd4c03aac7d87a022c77e8bdcdc2d (patch)
tree9ecc10b31b9937bcd4f88fce90e5bb14c7079e00 /app/assets/javascripts
parentdeb069c0c1afe18cb4ce3a94623272628e11674e (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/issuables_list/components/issuable.vue7
-rw-r--r--app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue2
-rw-r--r--app/assets/javascripts/vue_shared/components/issue/issue_assignees.vue2
3 files changed, 5 insertions, 6 deletions
diff --git a/app/assets/javascripts/issuables_list/components/issuable.vue b/app/assets/javascripts/issuables_list/components/issuable.vue
index b8f8e9a7f42..de71235c547 100644
--- a/app/assets/javascripts/issuables_list/components/issuable.vue
+++ b/app/assets/javascripts/issuables_list/components/issuable.vue
@@ -272,12 +272,11 @@ export default {
:target="linkTarget"
data-testid="issuable-title"
data-qa-selector="issue_link"
- >
- {{ issuable.title }}
- <gl-icon
+ >{{ issuable.title
+ }}<gl-icon
v-if="isJiraIssue"
name="external-link"
- class="gl-vertical-align-text-bottom"
+ class="gl-vertical-align-text-bottom gl-ml-2"
/>
</gl-link>
</span>
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue
index aa96f33bbc1..5f0c115f70b 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue
@@ -83,7 +83,7 @@ export default {
return {
initialRender: true,
recentSearchesPromise: null,
- recentSearches: [],
+ recentSearches: null,
filterValue: this.initialFilterValue,
selectedSortOption,
selectedSortDirection,
diff --git a/app/assets/javascripts/vue_shared/components/issue/issue_assignees.vue b/app/assets/javascripts/vue_shared/components/issue/issue_assignees.vue
index 90fb17e569a..3006ba83f98 100644
--- a/app/assets/javascripts/vue_shared/components/issue/issue_assignees.vue
+++ b/app/assets/javascripts/vue_shared/components/issue/issue_assignees.vue
@@ -92,7 +92,7 @@ export default {
>
<span class="js-assignee-tooltip">
<span class="bold d-block">{{ __('Assignee') }}</span> {{ assignee.name }}
- <span class="text-white-50">@{{ assignee.username }}</span>
+ <span v-if="assignee.username" class="text-white-50">@{{ assignee.username }}</span>
</span>
</user-avatar-link>
<span