Add latest changes from gitlab-org/gitlab@master

12 files changed, 27 insertions, 10 deletions

diff --git a/app/assets/javascripts/artifacts/graphql/queries/get_job_artifacts.query.graphql b/app/assets/javascripts/artifacts/graphql/queries/get_job_artifacts.query.graphql
index 89a24d7891e..5737f9f8e8d 100644
--- a/app/assets/javascripts/artifacts/graphql/queries/get_job_artifacts.query.graphql
+++ b/app/assets/javascripts/artifacts/graphql/queries/get_job_artifacts.query.graphql
@@ -10,13 +10,12 @@ query getJobArtifacts(
   project(fullPath: $projectPath) {
     id
     jobs(
-      statuses: [SUCCESS, FAILED]
+      withArtifacts: true
       first: $firstPageSize
       last: $lastPageSize
       after: $nextPageCursor
       before: $prevPageCursor
     ) {
-      count
       nodes {
         id
         name
diff --git a/app/assets/javascripts/contributors/components/contributors.vue b/app/assets/javascripts/contributors/components/contributors.vue
index 6d94af66092..17e6cc87ff8 100644
--- a/app/assets/javascripts/contributors/components/contributors.vue
+++ b/app/assets/javascripts/contributors/components/contributors.vue
@@ -238,7 +238,6 @@ export default {
               :project-id="projectId"
               :enabled-ref-types="$options.refTypes"
               :translations="$options.i18n.refSelectorTranslations"
-              toggle-button-class="gl-max-w-26"
               @input="visitBranch"
             />
           </div>
diff --git a/app/assets/javascripts/ref/components/ref_selector.vue b/app/assets/javascripts/ref/components/ref_selector.vue
index 70b8604b3f1..2f5b5bcebd6 100644
--- a/app/assets/javascripts/ref/components/ref_selector.vue
+++ b/app/assets/javascripts/ref/components/ref_selector.vue
@@ -142,6 +142,7 @@ export default {
           'gl-inset-border-1-red-500!': !this.state,
           'gl-font-monospace': Boolean(this.selectedRef),
         },
+        'gl-max-w-26',
       ];
 
       if (Array.isArray(this.toggleButtonClass)) {
@@ -257,7 +258,7 @@ export default {
       :header-text="i18n.dropdownHeader"
       :toggle-class="extendedToggleButtonClass"
       :text="buttonText"
-      class="ref-selector gl-w-full"
+      class="ref-selector"
       v-bind="$attrs"
       v-on="$listeners"
       @shown="focusSearchBox"
diff --git a/app/assets/stylesheets/startup/startup-dark.scss b/app/assets/stylesheets/startup/startup-dark.scss
index 1ff3d183b82..df81d9fbbd0 100644
--- a/app/assets/stylesheets/startup/startup-dark.scss
+++ b/app/assets/stylesheets/startup/startup-dark.scss
@@ -1839,9 +1839,15 @@ body.gl-dark .navbar-gitlab .search form .search-input {
 .gl-align-items-stretch {
   align-items: stretch;
 }
+.gl-flex-grow-0\! {
+  flex-grow: 0 !important;
+}
 .gl-flex-grow-1 {
   flex-grow: 1;
 }
+.gl-flex-basis-half\! {
+  flex-basis: 50% !important;
+}
 .gl-justify-content-end {
   justify-content: flex-end;
 }
diff --git a/app/assets/stylesheets/startup/startup-general.scss b/app/assets/stylesheets/startup/startup-general.scss
index 4850195065c..adafe719892 100644
--- a/app/assets/stylesheets/startup/startup-general.scss
+++ b/app/assets/stylesheets/startup/startup-general.scss
@@ -1668,9 +1668,15 @@ svg.s16 {
 .gl-align-items-stretch {
   align-items: stretch;
 }
+.gl-flex-grow-0\! {
+  flex-grow: 0 !important;
+}
 .gl-flex-grow-1 {
   flex-grow: 1;
 }
+.gl-flex-basis-half\! {
+  flex-basis: 50% !important;
+}
 .gl-justify-content-end {
   justify-content: flex-end;
 }
diff --git a/app/finders/ci/jobs_finder.rb b/app/finders/ci/jobs_finder.rb
index 1627e41a02d..8620dff6973 100644
--- a/app/finders/ci/jobs_finder.rb
+++ b/app/finders/ci/jobs_finder.rb
@@ -75,7 +75,7 @@ module Ci
 
     def filter_by_with_artifacts(builds)
       if params[:with_artifacts]
-        builds.with_erasable_artifacts
+        builds.with_any_artifacts
       else
         builds
       end
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 4dffaa06364..f8b3777841d 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -90,6 +90,12 @@ module Ci
 
     scope :unstarted, -> { where(runner_id: nil) }
 
+    scope :with_any_artifacts, -> do
+      where('EXISTS (?)',
+        Ci::JobArtifact.select(1).where("#{Ci::Build.quoted_table_name}.id = #{Ci::JobArtifact.quoted_table_name}.job_id")
+      )
+    end
+
     scope :with_downloadable_artifacts, -> do
       where('EXISTS (?)',
         Ci::JobArtifact.select(1)
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 6e0d228ab8c..bea86168c8d 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -181,7 +181,7 @@ class Issue < ApplicationRecord
   scope :confidential_only, -> { where(confidential: true) }
 
   scope :without_hidden, -> {
-    where.not(author_id: Users::BannedUser.select(:user_id))
+    where('NOT EXISTS (?)', Users::BannedUser.select(1).where('issues.author_id = banned_users.user_id'))
   }
 
   scope :counts_by_state, -> { reorder(nil).group(:state_id).count }
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 5c7010bf523..6d000c3e9ad 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -133,7 +133,7 @@
               %li.nav-item
                 = render Pajamas::ButtonComponent.new(href: new_user_registration_path) do
                   = _('Register')
-            %li.nav-item
+            %li.nav-item{ class: 'gl-flex-grow-0! gl-flex-basis-half!' }
               = link_to _('Sign in'), new_session_path(:user, redirect_to_referer: 'yes')
 
       %button.navbar-toggler.d-block.d-sm-none{ type: 'button', class: 'gl-border-none!', data: { testid: 'top-nav-responsive-toggle', qa_selector: 'mobile_navbar_button' } }
diff --git a/app/views/projects/tree/_tree_header.html.haml b/app/views/projects/tree/_tree_header.html.haml
index fd807350245..51555293bfb 100644
--- a/app/views/projects/tree/_tree_header.html.haml
+++ b/app/views/projects/tree/_tree_header.html.haml
@@ -1,6 +1,6 @@
 - is_project_overview = local_assigns.fetch(:is_project_overview, false)
 
-.tree-ref-container.gl-display-flex.mb-2.mb-md-0
+.tree-ref-container.gl-display-flex.gl-flex-wrap.gl-gap-2.mb-2.mb-md-0
   .tree-ref-holder
     #js-tree-ref-switcher{ data: { project_id: @project.id, project_root_path: project_path(@project) } }
 
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml
index e5d78aa9039..2a16004e743 100644
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -2336,7 +2336,7 @@
   :tags: []
 - :name: ci_parse_secure_file_metadata
   :worker_name: Ci::ParseSecureFileMetadataWorker
-  :feature_category: :mobile_signing_deployment
+  :feature_category: :mobile_devops
   :has_external_dependencies: false
   :urgency: :low
   :resource_boundary: :unknown
diff --git a/app/workers/ci/parse_secure_file_metadata_worker.rb b/app/workers/ci/parse_secure_file_metadata_worker.rb
index 0d2495d3155..8703bb13776 100644
--- a/app/workers/ci/parse_secure_file_metadata_worker.rb
+++ b/app/workers/ci/parse_secure_file_metadata_worker.rb
@@ -4,7 +4,7 @@ module Ci
   class ParseSecureFileMetadataWorker
     include ::ApplicationWorker
 
-    feature_category :mobile_signing_deployment
+    feature_category :mobile_devops
     urgency :low
     idempotent!