Add latest changes from gitlab-org/gitlab@master

2024-11-14 09:16:18 +00:00 · 2024-11-14 09:16:18 +00:00 · 8028505496
parent 00dc78ee0e
commit 8028505496
13 changed files with 49 additions and 41 deletions
--- a/app/assets/javascripts/ci/job_details/components/sidebar/external_links_block.vue
+++ b/app/assets/javascripts/ci/job_details/components/sidebar/external_links_block.vue
@ -19,12 +19,7 @@ export default {
    <div class="title gl-font-bold">{{ s__('Job|External links') }}</div>
    <ul class="gl-m-0 gl-list-none gl-p-0">
      <li v-for="(externalLink, index) in externalLinks" :key="index">
-        <gl-link
-          :href="externalLink.url"
-          target="_blank"
-          rel="noopener noreferrer nofollow"
-          class="!gl-text-link"
-        >
+        <gl-link :href="externalLink.url" target="_blank" rel="noopener noreferrer nofollow">
          <gl-icon name="external-link" class="flex-shrink-0" />
          {{ externalLink.label }}
        </gl-link>
--- a/app/assets/javascripts/ci/jobs_page/components/job_cells/job_cell.vue
+++ b/app/assets/javascripts/ci/jobs_page/components/job_cells/job_cell.vue
@ -77,12 +77,7 @@ export default {
        data-testid="stuck-icon"
      />

-      <gl-link
-        v-if="canReadJob"
-        class="!gl-text-blue-600"
-        :href="jobPath"
-        data-testid="job-id-link"
-      >
+      <gl-link v-if="canReadJob" :href="jobPath" data-testid="job-id-link">
        <span class="gl-truncate">
          <span data-testid="job-name">{{ jobId }}: {{ job.name }}</span>
        </span>
--- a/app/assets/javascripts/ci/pipelines_page/components/pipeline_url.vue
+++ b/app/assets/javascripts/ci/pipelines_page/components/pipeline_url.vue
@ -155,12 +155,9 @@ export default {
          :title="pipelineIdentifier.text"
          class="gl-grow gl-truncate gl-text-gray-900"
        >
-          <gl-link
-            :href="pipelineIdentifier.link"
-            class="!gl-text-link"
-            data-testid="pipeline-identifier-link"
-            >{{ pipelineIdentifier.text }}</gl-link
-          >
+          <gl-link :href="pipelineIdentifier.link" data-testid="pipeline-identifier-link">{{
+            pipelineIdentifier.text
+          }}</gl-link>
        </tooltip-on-truncate>
      </span>
    </div>
@ -177,7 +174,7 @@ export default {
        >
          <gl-link
            :href="commitUrl"
-            class="commit-row-message !gl-text-blue-600"
+            class="commit-row-message"
            data-testid="commit-title"
            @click="trackClick('click_commit_title')"
            >{{ commitTitle }}</gl-link
@ -192,7 +189,7 @@ export default {
    <div class="gl-mb-2">
      <gl-link
        :href="pipeline.path"
-        class="gl-mr-1 !gl-text-link"
+        class="gl-mr-1"
        data-testid="pipeline-url-link"
        @click="trackClick('click_pipeline_id')"
        >#{{ pipeline[pipelineIdType] }}</gl-link
--- a/app/assets/javascripts/ci/pipelines_page/components/time_ago.vue
+++ b/app/assets/javascripts/ci/pipelines_page/components/time_ago.vue
@ -38,7 +38,7 @@ export default {
  <div class="gl-flex gl-flex-col gl-items-end lg:gl-items-start" :class="fontSize">
    <p
      v-if="duration"
-      class="gl-m-0 gl-inline-flex gl-items-center gl-whitespace-nowrap gl-text-secondary"
+      class="gl-m-0 gl-inline-flex gl-items-center gl-whitespace-nowrap gl-text-subtle"
      data-testid="duration"
    >
      <gl-icon name="timer" class="gl-mr-2" :size="12" />
@ -47,7 +47,7 @@ export default {

    <p
      v-if="finishedTime"
-      class="gl-m-0 gl-inline-flex gl-items-center gl-whitespace-nowrap gl-text-secondary"
+      class="gl-m-0 gl-inline-flex gl-items-center gl-whitespace-nowrap gl-text-subtle"
      data-testid="finished-at"
    >
      <gl-icon name="calendar" class="gl-mr-2" :size="12" data-testid="calendar-icon" />
--- a/app/assets/javascripts/todos/components/mutations/mark_as_done.mutation.graphql
+++ b/app/assets/javascripts/todos/components/mutations/mark_as_done.mutation.graphql
@ -1,9 +1,8 @@
-#import "../queries/todo.fragment.graphql"
-
 mutation markAsDone($todoId: TodoID!) {
  toggleStatus: todoMarkDone(input: { id: $todoId }) {
    todo {
-      ...Todo
+      id
+      state
    }
    errors
  }
--- a/app/assets/javascripts/todos/components/mutations/mark_as_pending.mutation.graphql
+++ b/app/assets/javascripts/todos/components/mutations/mark_as_pending.mutation.graphql
@ -1,9 +1,8 @@
-#import "../queries/todo.fragment.graphql"
-
 mutation markAsPending($todoId: TodoID!) {
  toggleStatus: todoRestore(input: { id: $todoId }) {
    todo {
-      ...Todo
+      id
+      state
    }
    errors
  }
--- a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue
+++ b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue
@ -443,7 +443,7 @@ export default {
                  :data-avatar-url="author.avatarUrl"
                  :href="author.webPath"
                  data-testid="issuable-author"
-                  class="author-link js-user-link gl-text-sm !gl-text-gray-500"
+                  class="author-link js-user-link gl-text-sm !gl-text-subtle"
                  @click.stop
                >
                  <span class="author">{{ author.name }}</span>
@ -530,7 +530,7 @@ export default {
      </ul>
      <div
        v-gl-tooltip.bottom
-        class="gl-hidden gl-text-gray-500 sm:gl-inline-block"
+        class="gl-hidden gl-text-subtle sm:gl-inline-block"
        :title="tooltipTitle(timestamp)"
        data-testid="issuable-timestamp"
      >
--- a/app/assets/javascripts/work_items/components/work_item_type_icon.vue
+++ b/app/assets/javascripts/work_items/components/work_item_type_icon.vue
@ -33,7 +33,7 @@ export default {
    colorClass: {
      type: String,
      required: false,
-      default: 'gl-text-secondary',
+      default: 'gl-fill-icon-default',
    },
  },
  computed: {
--- a/app/assets/stylesheets/page_bundles/issuable_list.scss
+++ b/app/assets/stylesheets/page_bundles/issuable_list.scss
@ -20,7 +20,7 @@

    .issuable-info,
    .issuable-meta {
-      font-size: $gl-font-size-sm;
+      @apply gl-text-sm;
    }

    .issuable-meta {
@ -53,10 +53,10 @@
    .task-status,
    .issuable-timestamp {
      font-weight: $gl-font-weight-normal;
-      color: var(--gray-500, $gl-text-color-secondary);
+      @apply gl-text-subtle;

      a {
-        color: var(--gl-text-color-default);
+        @apply gl-text-default;
      }

      // stylelint-disable-next-line gitlab/no-gl-class
--- a/doc/subscriptions/self_managed/index.md
+++ b/doc/subscriptions/self_managed/index.md
@ -223,6 +223,8 @@ your instance immediately. If you're using a license file, you receive an update
 To add the seats, [add the license file](../../administration/license_file.md)
 to your instance.

+If you purchased your subscription through an [authorized reseller](../customers_portal.md#customers-that-purchased-through-a-reseller) (including GCP and AWS marketplaces), contact the reseller to add more seats.
+
 ## Subscription data synchronization

 Prerequisites:
--- a/doc/user/project/repository/signed_commits/gpg.md
+++ b/doc/user/project/repository/signed_commits/gpg.md
@ -278,14 +278,30 @@ git config --global gpg.program gpg2
 If your GPG key is password protected and the password entry prompt does not appear,
 add `export GPG_TTY=$(tty)` to your shell's `rc` file (commonly `~/.bashrc` or `~/.zshrc`)

-### GPG failed to sign the data
+### GPG fails to sign data

-If your GPG key is password protected and you receive the error:
+If your GPG key is password protected, and you receive one of the following errors:

-```shell
+```plaintext
 error: gpg failed to sign the data
 fatal: failed to write commit object
+gpg: signing failed: Inappropriate ioctl for device
 ```

-If the password entry prompt does not appear, add `export GPG_TTY=$(tty)` to your shell's `rc` file
-(commonly `~/.bashrc` or `~/.zshrc`) and restart your terminal.
+If the password entry prompt doesn't appear:
+
+1. Open your shell's configuration file, commonly `~/.bashrc` or `~/.zshrc`, in a text editor.
+1. Add the following line to the file:
+
+   ```shell
+   export GPG_TTY=$(tty)
+   ```
+
+1. Save the file and exit the text editor.
+1. Apply the changes. Choose one of the following:
+
+   - Restart your terminal.
+   - Run `source ~/.bashrc` or `source ~/.zshrc`.
+
+NOTE:
+The exact steps may vary depending on your operating system and shell configuration.
--- a/qa/qa/specs/features/api/1_manage/import/import_github_repo_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/import/import_github_repo_spec.rb
@ -10,7 +10,12 @@ module QA
      end

      context 'when imported via api' do
-        it 'imports project', :blocking, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347670' do
+        it 'imports project', :blocking,
+          quarantine: {
+            issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/503715',
+            type: :stale
+          },
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347670' do
          expect_project_import_finished_successfully

          aggregate_failures do
--- a/scripts/remote_development/run-e2e-tests.sh
+++ b/scripts/remote_development/run-e2e-tests.sh
@ -15,7 +15,7 @@ DEFAULT_PASSWORD='5iveL!fe'

 export WEBDRIVER_HEADLESS="${WEBDRIVER_HEADLESS:-0}"
 export GITLAB_USERNAME="${GITLAB_USERNAME:-root}"
-export GITLAB_PASSWORD="${GITLAB_PASSWORD:-${DEFAULT_PASSWORD}}"
+export GITLAB_INITIAL_ROOT_PASSWORD="${GITLAB_INITIAL_ROOT_PASSWORD:-${DEFAULT_PASSWORD}}"
 export GITLAB_QA_ACCESS_TOKEN="${PERSONAL_ACCESS_TOKEN:-${TOKEN_VALUE}}"
 export DEVFILE_PROJECT="${DEVFILE_PROJECT:-Gitlab Org / Gitlab Shell}"
 export AGENT_NAME="${AGENT_NAME:-remotedev}"