Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/issue_templates/Plan - Spike.md

@@ -0,0 +1,29 @@
+<!--The purpose of this spike template is to ensure that the teams have all the information they need before approaching a spike. Teams across product, engineering and design should collaborate to ensure the feature tackled in the spike is thought through and that all necessary details are included.
+
+This template is not a set-in-stone prerequisite for spikes as some of the spikes are more abstract. So this template is designed to be customizable and fit the majority of the use cases.-->
+
+## Proposal
+
+### What is the goal of this spike?
+
+`{ Add a description about the feature and why we are implementing it. Leave as many details as known/necessary. }`
+
+### Scope/MVC
+
+- _What features are considered GA and non-GA and how do they look like/function?  What are the absolute must have fetures we want from this PSike and what would be an add-on? A checklist might be beneficial to include._
+- _Any known blockers/dependancies (not necessarily from a technical perspective). Are there other moving parts or spikes related to this one? In which capacity are they related?_
+
+### Designs :frame_photo:
+
+_Links to designs, they can be WIP. Please note that this refernce should be the absoulte source of truth for designs. Any other information can be put here related to the designs._
+
+## Roadmap / Time estimates
+
+_This section is for product to include any relevant links to roadmaps and general timelines with respect to the project in question and related/blocking spikes. This section can also be used by engineers to roughly determine when do we want to deliver the outcomes after the spike is done. Timelines are never set in stone, but this can be a good pointer for everyone._
+
+## Open questions
+
+_Any other related unknowns or information deemed useful for the spike. This can include assumptions that need validation or any other questions that need general verification._
+
+
+<!--The template is stored at `.gitlab/issue_templates/Plan - Spike.md` directory if you need to update it -->

app/assets/javascripts/boards/components/board_card_move_to_position.vue

@@ -110,8 +110,8 @@ export default {
     category="tertiary"
     :items="$options.BOARD_CARD_MOVE_TO_POSITIONS_OPTIONS"
     icon="ellipsis_v"
-    :aria-label="$options.i18n.moveCardText"
-    :text-sr-only="true"
+    :toggle-text="$options.i18n.moveCardText"
+    text-sr-only
     no-caret
     data-testid="board-move-to-position"
     @action="selectMoveAction"

app/assets/javascripts/ci/pipeline_schedules/components/pipeline_schedules_form.vue

@@ -296,6 +296,7 @@ export default {
           :value="cronTimezone"
           :timezone-data="timezoneData"
           name="schedule-timezone"
+          required
           @input="setTimezone"
         />
       </gl-form-group>

app/assets/javascripts/ci/runner/components/runner_list_header.vue

@@ -9,12 +9,12 @@ export default {
 };
 </script>
 <template>
-  <page-heading class="gl-mb-0">
+  <page-heading class="gl-mb-3">
     <template #heading>
       <slot name="title"></slot>
     </template>
 
-    <template #description>
+    <template v-if="$scopedSlots.description" #description>
       <slot name="description"></slot>
     </template>
 

app/assets/javascripts/glql/components/common/actions.vue

@@ -67,7 +67,6 @@ export default {
       :toggle-text="__('GLQL view options')"
       text-sr-only
       placement="bottom-end"
-      positioning-strategy="fixed"
     />
   </div>
 </template>

app/assets/javascripts/vue_shared/components/timezone_dropdown/timezone_dropdown.vue

@@ -17,7 +17,6 @@ export default {
     value: {
       type: String,
       required: true,
-      default: '',
     },
     name: {
       type: String,
@@ -34,6 +33,11 @@ export default {
       required: false,
       default: () => [],
     },
+    required: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   data() {
     return {
@@ -94,13 +98,15 @@ export default {
 };
 </script>
 <template>
-  <div>
+  <div class="gl-relative">
     <input
       v-if="name"
       id="user_timezone"
       :name="name"
       :value="timezoneIdentifier || value"
-      type="hidden"
+      :required="required"
+      tabindex="-1"
+      class="gl-sr-only gl-absolute -gl-z-1 gl-h-full gl-w-full"
     />
     <gl-collapsible-listbox
       :header-text="headerText"

app/assets/stylesheets/page_bundles/issues_show.scss

@@ -36,10 +36,10 @@
       inset-inline-start: -0.6rem;
     }
   }
+}
 
-  .glql-actions li {
-    @apply gl-ml-2;
-  }
+.glql-actions li {
+  @apply gl-ml-2;
 }
 
 .is-ghost {

app/finders/groups_finder.rb

@@ -110,6 +110,7 @@ def filter_groups(groups)
     groups = by_visibility(groups)
     groups = by_ids(groups)
     groups = top_level_only(groups)
+    groups = by_marked_for_deletion_on(groups)
     by_search(groups)
   end
 
@@ -142,6 +143,12 @@ def by_parent_children(groups, parent)
     groups.by_parent(parent)
   end
 
+  def by_marked_for_deletion_on(groups)
+    return groups unless params[:marked_for_deletion_on].present?
+
+    groups.by_marked_for_deletion_on(params[:marked_for_deletion_on])
+  end
+
   def filter_group_ids(groups)
     return groups unless params[:filter_group_ids]
 

app/finders/projects_finder.rb

@@ -98,6 +98,8 @@ def filter_projects(collection)
     collection = by_feature_availability(collection)
     collection = by_updated_at(collection)
     collection = by_organization(collection)
+    collection = by_marked_for_deletion_on(collection)
+    collection = by_aimed_for_deletion(collection)
     by_repository_storage(collection)
   end
 
@@ -219,6 +221,20 @@ def by_topic_id(items)
     items.with_topic(topic)
   end
 
+  def by_marked_for_deletion_on(items)
+    return items unless params[:marked_for_deletion_on].present?
+
+    items.by_marked_for_deletion_on(params[:marked_for_deletion_on])
+  end
+
+  def by_aimed_for_deletion(items)
+    if ::Gitlab::Utils.to_boolean(params[:aimed_for_deletion])
+      items.aimed_for_deletion(Date.current)
+    else
+      items
+    end
+  end
+
   def by_not_aimed_for_deletion(items)
     params[:not_aimed_for_deletion].present? ? items.not_aimed_for_deletion : items
   end
@@ -298,11 +314,11 @@ def by_active(items)
   end
 
   def active(items)
-    items.non_archived
+    items.non_archived.not_aimed_for_deletion
   end
 
   def inactive(items)
-    items.archived
+    items.archived.or(items.aimed_for_deletion(Date.current))
   end
 
   def finder_params

app/models/ci/runner.rb

@@ -25,7 +25,9 @@ class Runner < Ci::ApplicationRecord
       expires_at: :compute_token_expiration,
       format_with_prefix: :prefix_for_new_and_legacy_runner,
       routable_token: {
-        if: ->(token_owner_record) { token_owner_record.owner },
+        if: ->(token_owner_record) {
+          token_owner_record.owner && Feature.enabled?(:routable_runner_token, token_owner_record.owner)
+        },
         payload: {
           o: ->(token_owner_record) { token_owner_record.owner.try(:organization_id) },
           g: ->(token_owner_record) { token_owner_record.group_type? ? token_owner_record.sharding_key_id : nil },

app/views/layouts/notify.html.haml

@@ -44,6 +44,9 @@
             #{link_to _('View it on GitLab'), @target_url}.
           %br
           = notification_reason_text(reason: @reason, show_manage_notifications_link: !@labels_url, show_help_link: true, manage_label_subscriptions_url: @labels_url, unsubscribe_url: @unsubscribe_url, format: :html)
+          - if Feature.enabled?(:fix_gmail_footer_truncation, @project)
+            %span{ style: "color:transparent;font-size:0;display:none;overflow:hidden;opacity:0;width:0;height:0;max-width:0;max-height:0" }
+              = 'Notification message regarding ' + @target_url + " at #{Time.current.to_i}"
 
           = email_action @target_url
 

config/feature_flags/gitlab_com_derisk/routable_runner_token.yml

@@ -0,0 +1,9 @@
+---
+name: routable_runner_token
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/489847
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/170634
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/505790
+milestone: '17.10'
+group: group::cells infrastructure
+type: gitlab_com_derisk
+default_enabled: false

config/feature_flags/wip/fix_gmail_footer_truncation.patch

@@ -0,0 +1,31 @@
+diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml
+index 826d822354b6..b713cee3266f 100644
+--- a/app/views/layouts/notify.html.haml
++++ b/app/views/layouts/notify.html.haml
+@@ -44,9 +44,8 @@
+             #{link_to _('View it on GitLab'), @target_url}.
+           %br
+           = notification_reason_text(reason: @reason, show_manage_notifications_link: !@labels_url, show_help_link: true, manage_label_subscriptions_url: @labels_url, unsubscribe_url: @unsubscribe_url, format: :html)
+-          - if Feature.enabled?(:fix_gmail_footer_truncation, @project)
+-            %span{ style: "color:transparent;font-size:0;display:none;overflow:hidden;opacity:0;width:0;height:0;max-width:0;max-height:0" }
+-              = 'Notification message regarding ' + @target_url + " at #{Time.current.to_i}"
++          %span{ style: "color:transparent;font-size:0;display:none;overflow:hidden;opacity:0;width:0;height:0;max-width:0;max-height:0" }
++            = 'Notification message regarding ' + @target_url + " at #{Time.current.to_i}"
+ 
+           = email_action @target_url
+ 
+diff --git a/config/feature_flags/wip/fix_gmail_footer_truncation.yml b/config/feature_flags/wip/fix_gmail_footer_truncation.yml
+deleted file mode 100644
+index e092a0d092b6..000000000000
+--- a/config/feature_flags/wip/fix_gmail_footer_truncation.yml
++++ /dev/null
+@@ -1,9 +0,0 @@
+----
+-name: fix_gmail_footer_truncation
+-feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/14072
+-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/177913
+-rollout_issue_url:
+-milestone: '17.11'
+-group: group::ux paper cuts
+-type: wip
+-default_enabled: false

config/feature_flags/wip/fix_gmail_footer_truncation.yml

@@ -0,0 +1,9 @@
+---
+name: fix_gmail_footer_truncation
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/14072
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/177913
+rollout_issue_url:
+milestone: '17.11'
+group: group::ux paper cuts
+type: wip
+default_enabled: false

data/deprecations/17-7-deprecate-SPPgraphqlmutation.yml

@@ -12,9 +12,6 @@
   manual_task: true
   body: |
     The `setPreReceiveSecretDetection` GraphQL mutation has been renamed to `setSecretPushProtection`. We are also renaming some fields in the mutation's response to reflect the name change of the feature `pre_receive_secret_detection` to `secret_push_protection`.
-    To avoid breaking workflows that use the old name, before GitLab 18.0 you should:
-
-    - Stop using the old mutation name `setPreReceiveSecretDetection`. Instead, use the name `setSecretPushProtection`.
-    - Change any references to the field `pre_receive_secret_detection_enabled` to `secret_push_protection_enabled`.
+    Following [new guidance](https://docs.gitlab.com/development/api_styleguide/#what-to-do-instead-of-a-breaking-change), we're adapting the schema to support both `setPreReceiveSecretDetection` and `setSecretPushProtection`. You can use either parameter because they both point to the `secret_push_protection_enabled` column. In GitLab 18.0, we will [remove](https://gitlab.com/gitlab-org/gitlab/-/issues/514414) the old `setPreReceiveSecretDetection` column.
 
   documentation_url: https://docs.gitlab.com/api/graphql/reference/#mutationsetsecretpushprotection

data/deprecations/17-9-pre_receive_secret_detection_enabled-REST-API.yml

@@ -11,6 +11,6 @@
   manual_task: true
   body: |  # (required) Don't change this line.
    The REST API endpoint `pre_receive_secret_detection_enabled` is deprecated in favor of `secret_push_protection_enabled`. We are renaming some API fields to reflect the name change of the feature `pre_receive_secret_detection` to `secret_push_protection`.
-   To avoid breaking workflows that use the old name, you should stop using the `pre_receive_secret_detection_enabled` endpoint before GitLab 18.0. Instead, use the new `secret_push_protection_enabled` endpoint.
+   Following [new guidance](https://docs.gitlab.com/development/api_styleguide/#what-to-do-instead-of-a-breaking-change), we will adapt the schema to support both `pre_receive_secret_detection_enabled` and `secret_push_protection_enabled`. We will still [remove](https://gitlab.com/gitlab-org/gitlab/-/issues/512996) the old `pre_receive_secret_detection_enabled` column, but customers will be able to use either parameter, with both pointing to the new `secret_push_protection_enabled` column.
   tiers: ultimate
   documentation_url: https://docs.gitlab.com/api/projects/#secret-push-protection-status

data/deprecations/17-9-secret-detection-root-user.yml

@@ -12,5 +12,5 @@
   resolution_role: Admin # Can be one of: [Admin, Owner, Maintainer, Developer]
   manual_task: false # Can be true or false. Use this to denote whether a resolution action must be performed manually (true), or if it can be automated by using the API or other automation (false).
   body: | # (required) Don't change this line.
-    From GitLab 18.0, the secret detection analyzer will no longer use the root user by default. You shouldn't experience any impact as a result of this change. However, you might experience issues if you use `before_script` or `after_script` to make changes to the image. GitLab doesn't support this use of `before_script` and `after_script`.
+    This planned change to the secret detection analyzer is cancelled. You can still use the root user by default.
   tiers: ultimate