diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-06 12:09:59 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-06 12:09:59 +0000 |
| commit | c737c54ea26dd4c03aac7d87a022c77e8bdcdc2d (patch) | |
| tree | 9ecc10b31b9937bcd4f88fce90e5bb14c7079e00 /app | |
| parent | deb069c0c1afe18cb4ce3a94623272628e11674e (diff) | |
| download | gitlab-ce-c737c54ea26dd4c03aac7d87a022c77e8bdcdc2d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
5 files changed, 7 insertions, 7 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 diff --git a/app/services/projects/cleanup_service.rb b/app/services/projects/cleanup_service.rb index 04624b96bf0..4ced9feff00 100644 --- a/app/services/projects/cleanup_service.rb +++ b/app/services/projects/cleanup_service.rb @@ -22,7 +22,7 @@ module Projects apply_bfg_object_map! # Remove older objects that are no longer referenced - GitGarbageCollectWorker.new.perform(project.id, :gc) + GitGarbageCollectWorker.new.perform(project.id, :gc, "project_cleanup:gc:#{project.id}") # The cache may now be inaccurate, and holding onto it could prevent # bugs assuming the presence of some object from manifesting for some diff --git a/app/workers/git_garbage_collect_worker.rb b/app/workers/git_garbage_collect_worker.rb index 459fc5992d8..c3f5e6271d3 100644 --- a/app/workers/git_garbage_collect_worker.rb +++ b/app/workers/git_garbage_collect_worker.rb @@ -11,6 +11,7 @@ class GitGarbageCollectWorker # rubocop:disable Scalability/IdempotentWorker LEASE_TIMEOUT = 86400 def perform(project_id, task = :gc, lease_key = nil, lease_uuid = nil) + lease_key ||= "git_gc:#{task}:#{project_id}" project = Project.find(project_id) active_uuid = get_lease_uuid(lease_key) |