Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/assets/javascripts/pages/users/activity_calendar.js

@@ -45,7 +45,7 @@ function formatTooltipText({ date, count }) {
   if (count > 0) {
     contribText = n__('%d contribution', '%d contributions', count);
   }
-  return `${contribText}<br /><span class="gl-text-subtle">${dateDayName} ${dateText}</span>`;
+  return `${contribText}<br /><span class="gl-text-gray-300 dark:gl-text-gray-700">${dateDayName} ${dateText}</span>`;
 }
 
 // Return the contribution level from the number of contributions

app/assets/javascripts/sidebar/components/assignees/issuable_assignees.vue

@@ -65,7 +65,7 @@ export default {
       v-else
       :users="users"
       :issuable-type="issuableType"
-      class="hide-collapsed gl-pt-2 gl-text-subtle"
+      class="hide-collapsed gl-pt-2"
     />
   </div>
 </template>

db/post_migrate/20241119085925_remove_namespace_limits_temporary_storage_increase_ends_on_column.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class RemoveNamespaceLimitsTemporaryStorageIncreaseEndsOnColumn < Gitlab::Database::Migration[2.2]
+  milestone '17.7'
+
+  def up
+    remove_column :namespace_limits, :temporary_storage_increase_ends_on
+  end
+
+  def down
+    add_column :namespace_limits, :temporary_storage_increase_ends_on, :date
+  end
+end

db/schema_migrations/20241119085925

@@ -0,0 +1 @@
+462c5e000ee5f773b3773ae1a224c72ebd19c2230f781b0ad59d7b14ae068102

db/structure.sql

@@ -15107,7 +15107,6 @@ CREATE TABLE namespace_limits (
     additional_purchased_storage_size bigint DEFAULT 0 NOT NULL,
     additional_purchased_storage_ends_on date,
     namespace_id bigint NOT NULL,
-    temporary_storage_increase_ends_on date,
     pre_enforcement_notification_at timestamp with time zone,
     first_enforced_at timestamp with time zone,
     last_enforced_at timestamp with time zone,

doc/policy/experiment-beta-support.md

@@ -5,7 +5,7 @@ description: Support details.
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
-# Support for experiment, beta, and generally available features
+# Support for experiment, beta, and publicly available features
 
 GitLab sometimes releases features as experimental or beta, and users can opt in and test the new experience.
 Some reasons for these kinds of feature releases include:
@@ -14,10 +14,10 @@ Some reasons for these kinds of feature releases include:
 - Features not complete enough to be considered an [MVC](https://handbook.gitlab.com/handbook/product/product-principles/#the-minimal-valuable-change-mvc),
   but added to the codebase as part of the development process.
 
-Please note that some features may not be aligned to these recommendations if they were developed before the recommendations were in place,
+Some features may not be aligned to these recommendations if they were developed before the recommendations were in place,
 or if a team determined an alternative implementation approach was needed.
 
-All other features are considered to be generally available (GA).
+All other features are considered to be publicly available.
 
 ## Experiment
 
@@ -47,18 +47,37 @@ Beta features:
 - Have a user experience that is complete or near completion.
 - Can be equivalent to partner "Public Preview" status.
 
-## Generally available (GA)
+## Public availability
+
+Two types of public releases are available:
+
+- Limited availability (LA)
+- Generally available (GA)
+
+Both types are production-ready, but have different scopes.
+
+### Limited availability (LA)
+
+Limited availability features:
+
+- Are ready for production use at a reduced scale.
+- Might initially be free, then become paid when generally available.
+- Might be offered at a discount before becoming generally available.
+- Might have commercial terms that change for new contracts when generally available.
+- Are [fully supported](https://about.gitlab.com/support/statement-of-support/) and documented.
+- Have a complete user experience aligned with GitLab design standards.
+
+### Generally available (GA)
 
 Generally available features:
 
 - Are ready for production use at any scale.
 - Are [fully supported](https://about.gitlab.com/support/statement-of-support/) and documented.
 - Have a complete user experience aligned with GitLab design standards.
 
-## All features are in production
+## Production features
 
-All experimental, beta, and generally available features are available on GitLab.com,
-so they are all considered to be "in production".
+All experimental, beta, and publicly available features are available on GitLab.com and are considered in production.
 
 ## GitLab experiment and beta development guidelines
 
@@ -76,7 +95,7 @@ could create significant risks or friction for GitLab users or the platform, suc
 In addition to the [experiment details](#experiment) for users, experiments should:
 
 - Offer a way to opt in with minimal friction. For example, needing to flip a feature flag is too much friction,
-  but a group or project-level setting in the UI is not.
+  but a group or project setting in the UI is not.
 - Link out to the [GitLab Testing Agreement](https://handbook.gitlab.com/handbook/legal/testing-agreement/) in the opt-in.
 - Have documentation that reflects that the feature is subject to the [GitLab Testing Agreement](https://handbook.gitlab.com/handbook/legal/testing-agreement/).
 - Have [UI that reflects the experiment status](https://design.gitlab.com/usability/feature-management#highlighting-feature-versions).
@@ -107,11 +126,13 @@ All beta features that [meet the review criteria](https://handbook.gitlab.com/ha
 must complete all sections up to and including the [beta section in the readiness template](https://gitlab.com/gitlab-com/gl-infra/readiness/-/blob/master/.gitlab/issue_templates/production_readiness.md#beta)
 by following the [Production Readiness Review process](https://handbook.gitlab.com/handbook/engineering/infrastructure/production/readiness/#process).
 
-### GA features
+### Publicly available features
+
+Publicly available features must:
 
-Generally available features that [meet the review criteria](https://handbook.gitlab.com/handbook/engineering/infrastructure/production/readiness/#criteria-for-starting-a-production-readiness-review)
-must complete the [Production Readiness Review](https://handbook.gitlab.com/handbook/engineering/infrastructure/production/readiness/)
-and complete all sections up to and including the [GA section in the readiness template](https://gitlab.com/gitlab-com/gl-infra/readiness/-/blob/master/.gitlab/issue_templates/production_readiness.md#general-availability).
+1. Meet the [review criteria](https://handbook.gitlab.com/handbook/engineering/infrastructure/production/readiness/#criteria-for-starting-a-production-readiness-review).
+1. Complete the [Production Readiness Review](https://handbook.gitlab.com/handbook/engineering/infrastructure/production/readiness/).
+1. Complete all sections up to and including the [GA section in the readiness template](https://gitlab.com/gitlab-com/gl-infra/readiness/-/blob/master/.gitlab/issue_templates/production_readiness.md#general-availability).
 
 ### Provide earlier access
 

locale/gitlab.pot

@@ -49697,6 +49697,9 @@ msgstr ""
 msgid "SecurityOrchestration|Create security policy"
 msgstr ""
 
+msgid "SecurityOrchestration|Custom roles"
+msgstr ""
+
 msgid "SecurityOrchestration|Custom scan experiment has ended in 17.3"
 msgstr ""
 

package.json

@@ -74,7 +74,7 @@
     "@gitlab/favicon-overlay": "2.0.0",
     "@gitlab/fonts": "^1.3.0",
     "@gitlab/query-language": "^0.0.5-a-20241112",
-    "@gitlab/query-language-rust": "0.1.0",
+    "@gitlab/query-language-rust": "0.1.1",
     "@gitlab/svgs": "3.121.0",
     "@gitlab/ui": "103.5.0",
     "@gitlab/vue-router-vue3": "npm:[email protected]",

spec/features/calendar_spec.rb

@@ -41,7 +41,7 @@ def get_cell_date_selector(contributions, date)
         "#{contributions} #{'contribution'.pluralize(contributions)}"
       end
 
-    "#{get_cell_level_selector(contributions)}[title='#{contribution_text}<br /><span class=\"gl-text-subtle\">#{date}</span>']"
+    "#{get_cell_level_selector(contributions)}[title='#{contribution_text}<br /><span class=\"gl-text-gray-300 dark:gl-text-gray-700\">#{date}</span>']"
   end
 
   def get_days_of_week

yarn.lock

@@ -1408,10 +1408,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/noop/-/noop-1.0.0.tgz#b1ecb8ae6b2abf9b2e28927e4fbb05b7a1b2704b"
   integrity sha512-nOltttik5o2BjBo8LnyeTFzHoLpMY/XcCVOC+lm9ZwU+ivEam8wafacMF0KTbRn1KVrIoHYdo70QnqS+vJiOVw==
 
-"@gitlab/[email protected].0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/query-language-rust/-/query-language-rust-0.1.0.tgz#78c2698444f856c97f3b7f4b0b037d2523c46e90"
-  integrity sha512-tbSxDCOaRR6llFr46I67hPcoeJZbx74bFpvUha0EA57oB0m1/os+6SN4IzlwzFeYbuJ7IkjIkw1r5g0x1hSuJg==
+"@gitlab/[email protected].1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@gitlab/query-language-rust/-/query-language-rust-0.1.1.tgz#970702976ff54536c3c62d374b635304248d3596"
+  integrity sha512-AEXlbbAXuKIkimaWPl+C+PTf5gtGKX1KQ+g49xhYFam+wS3y/z7T0DeNweK7wkWnCh8p54EOHpHR2mgE/ZfLuA==
 
 "@gitlab/query-language@^0.0.5-a-20241112":
   version "0.0.5-a-20241112"