diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-24 09:13:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-24 09:13:37 +0300 |
| commit | 3368cc98aff2a2261c5dea9887e626836864000a (patch) | |
| tree | cc47e5426e63c97e2234e12470bb02a6f2e4edfc /app | |
| parent | f41ba400eb6320979eccaec747bc1a80c14fbe15 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
3 files changed, 1 insertions, 7 deletions
diff --git a/app/assets/javascripts/search/sidebar/components/issues_filters.vue b/app/assets/javascripts/search/sidebar/components/issues_filters.vue index 4a2d3df6921..a77fb34cdba 100644 --- a/app/assets/javascripts/search/sidebar/components/issues_filters.vue +++ b/app/assets/javascripts/search/sidebar/components/issues_filters.vue @@ -41,10 +41,7 @@ export default { ); }, showArchivedFilter() { - return ( - archivedFilterData.scopes.includes(this.currentScope) && - this.glFeatures.searchIssuesHideArchivedProjects - ); + return archivedFilterData.scopes.includes(this.currentScope); }, showDivider() { return !this.useSidebarNavigation; diff --git a/app/workers/merge_request_cleanup_refs_worker.rb b/app/workers/merge_request_cleanup_refs_worker.rb index 92dfe8a8cb0..db1a1e96997 100644 --- a/app/workers/merge_request_cleanup_refs_worker.rb +++ b/app/workers/merge_request_cleanup_refs_worker.rb @@ -18,8 +18,6 @@ class MergeRequestCleanupRefsWorker FAILURE_THRESHOLD = 3 def perform_work - return unless Feature.enabled?(:merge_request_refs_cleanup) - unless merge_request logger.error('No existing merge request to be cleaned up.') return diff --git a/app/workers/schedule_merge_request_cleanup_refs_worker.rb b/app/workers/schedule_merge_request_cleanup_refs_worker.rb index ced1f443ea6..2ecc95335e2 100644 --- a/app/workers/schedule_merge_request_cleanup_refs_worker.rb +++ b/app/workers/schedule_merge_request_cleanup_refs_worker.rb @@ -12,7 +12,6 @@ class ScheduleMergeRequestCleanupRefsWorker def perform return if Gitlab::Database.read_only? - return unless Feature.enabled?(:merge_request_refs_cleanup) MergeRequest::CleanupSchedule.stuck_retry! MergeRequestCleanupRefsWorker.perform_with_capacity |