Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

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

@@ -1,13 +1,20 @@
 <script>
-import { GlButton, GlIcon, GlBadge, GlLoadingIcon, GlLink, GlTooltipDirective } from '@gitlab/ui';
+import {
+  GlButton,
+  GlIcon,
+  GlBadge,
+  GlSkeletonLoader,
+  GlLink,
+  GlTooltipDirective,
+} from '@gitlab/ui';
 import { __ } from '~/locale';
 
 export default {
   components: {
     GlButton,
     GlIcon,
     GlBadge,
-    GlLoadingIcon,
+    GlSkeletonLoader,
     GlLink,
   },
   directives: {
@@ -121,7 +128,7 @@ export default {
     },
     displayedCount() {
       if (this.isLoading) {
-        return '...';
+        return null;
       }
 
       return this.icon && !this.count ? '0' : this.count;
@@ -276,7 +283,8 @@ export default {
       :class="[bodyClass, { 'gl-rounded-b-base': !$scopedSlots.footer }]"
       data-testid="crud-body"
     >
-      <gl-loading-icon v-if="isLoading" size="sm" data-testid="crud-loading" />
+      <gl-skeleton-loader v-if="isLoading" :width="400" :lines="3" data-testid="crud-loading" />
+
       <span v-else-if="$scopedSlots.empty" class="gl-text-subtle" data-testid="crud-empty">
         <slot name="empty"></slot>
       </span>

app/assets/javascripts/webhooks/components/webhook_form_app.vue

@@ -1,9 +1,14 @@
 <script>
+import { GlFormGroup, GlFormInput, GlFormTextarea } from '@gitlab/ui';
+
 import FormUrlApp from './form_url_app.vue';
 import FormCustomHeaders from './form_custom_headers.vue';
 
 export default {
   components: {
+    GlFormGroup,
+    GlFormInput,
+    GlFormTextarea,
     FormUrlApp,
     FormCustomHeaders,
   },
@@ -16,19 +21,57 @@ export default {
     initialUrlVariables: {
       type: Array,
       required: false,
-      default: null,
+      default: () => [],
     },
     initialCustomHeaders: {
       type: Array,
       required: false,
-      default: null,
+      default: () => [],
+    },
+    initialName: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    initialDescription: {
+      type: String,
+      required: false,
+      default: '',
     },
   },
+  data() {
+    return {
+      name: this.initialName,
+      description: this.initialDescription,
+    };
+  },
 };
 </script>
 
 <template>
   <div>
+    <gl-form-group :label="s__('Webhooks|Name (optional)')" label-for="webhook-name">
+      <gl-form-input
+        id="webhook-name"
+        v-model="name"
+        name="hook[name]"
+        class="gl-form-input-xl"
+        data-testid="webhook-name"
+      />
+    </gl-form-group>
+
+    <gl-form-group :label="s__('Webhooks|Description (optional)')" label-for="webhook-description">
+      <gl-form-textarea
+        id="webhook-description"
+        v-model="description"
+        name="hook[description]"
+        class="gl-form-input-xl"
+        rows="4"
+        maxlength="2048"
+        data-testid="webhook-description"
+      />
+    </gl-form-group>
+
     <form-url-app :initial-url="initialUrl" :initial-url-variables="initialUrlVariables" />
     <form-custom-headers :initial-custom-headers="initialCustomHeaders" />
   </div>

app/assets/javascripts/webhooks/index.js

@@ -9,14 +9,22 @@ export default () => {
     return null;
   }
 
-  const { url: initialUrl, urlVariables, customHeaders } = el.dataset;
+  const {
+    name: initialName,
+    description: initialDescription,
+    url: initialUrl,
+    urlVariables,
+    customHeaders,
+  } = el.dataset;
 
   return new Vue({
     el,
     name: 'WebhookFormRoot',
     render(createElement) {
       return createElement(WebhookFormApp, {
         props: {
+          initialName,
+          initialDescription,
           initialUrl,
           initialUrlVariables: JSON.parse(urlVariables),
           initialCustomHeaders: JSON.parse(customHeaders),

app/helpers/hooks_helper.rb

@@ -3,6 +3,8 @@
 module HooksHelper
   def webhook_form_data(hook)
     {
+      name: hook.name,
+      description: hook.description,
       url: hook.url,
       url_variables: Gitlab::Json.dump(hook.url_variables.keys.map { { key: _1 } }),
       custom_headers: Gitlab::Json.dump(hook.custom_headers.keys.map { { key: _1, value: WebHook::SECRET_MASK } })

app/models/packages/terraform_module/metadatum.rb

@@ -15,7 +15,7 @@ class Metadatum < ApplicationRecord
 
       attribute :fields, default: -> { {} }
 
-      ignore_column :semver_patch_convert_to_bigint, remove_with: '18.1', remove_after: '2025-05-20'
+      ignore_column :semver_patch_convert_to_bigint, remove_with: '18.2', remove_after: '2025-06-20'
 
       validates :package, :project, presence: true
       validates :fields, json_schema: { filename: 'terraform_module_metadata', detail_errors: true },

app/views/admin/hooks/_form.html.haml

@@ -1,15 +1,15 @@
 = form_errors(hook)
 
-.form-group
-  = form.label :url, _('URL'), class: 'label-bold'
-  = form.text_field :url, class: 'form-control gl-form-input'
-  %p.form-text.gl-text-subtle= _('URL must be percent-encoded if necessary.')
 .form-group
   = form.label :name, s_('Webhooks|Name (optional)'), class: 'label-bold'
   = form.text_field :name, value: hook.name, class: 'form-control gl-form-input gl-form-input-xl'
 .form-group
   = form.label :description, s_('Webhooks|Description (optional)'), class: 'label-bold'
   = form.text_area :description, value: hook.description, class: 'form-control gl-form-input gl-form-input-xl', rows: 4, maxlength: 2048
+.form-group
+  = form.label :url, _('URL'), class: 'label-bold'
+  = form.text_field :url, class: 'form-control gl-form-input'
+  %p.form-text.gl-text-subtle= _('URL must be percent-encoded if necessary.')
 .form-group
   = form.label :token, _('Secret token'), class: 'label-bold'
   = form.password_field :token, value: hook.masked_token, autocomplete: 'new-password', class: 'form-control gl-form-input gl-max-w-48'

app/views/shared/web_hooks/_form.html.haml

@@ -1,12 +1,6 @@
 = form_errors(hook)
 
 .js-vue-webhook-form{ data: webhook_form_data(hook) }
-.form-group
-  = form.label :name, s_('Webhooks|Name (optional)'), class: 'label-bold'
-  = form.text_field :name, value: hook.name, class: 'form-control gl-form-input gl-form-input-xl'
-.form-group
-  = form.label :description, s_('Webhooks|Description (optional)'), class: 'label-bold'
-  = form.text_area :description, value: hook.description, class: 'form-control gl-form-input gl-form-input-xl', rows: 4, maxlength: 2048
 .form-group
   = form.label :token, s_('Webhooks|Secret token'), class: 'label-bold'
   = form.password_field :token, value: hook.masked_token, autocomplete: 'new-password', class: 'form-control gl-form-input gl-form-input-xl'

config/routes/dashboard.rb

@@ -13,7 +13,11 @@
     resources :milestones, only: [:index]
     resources :labels, only: [:index]
 
-    resources :groups, only: [:index]
+    resources :groups, only: [:index] do
+      collection do
+        get :member, :inactive, to: 'groups#index'
+      end
+    end
     resources :snippets, only: [:index]
 
     resources :todos, only: [:index, :destroy]

db/docs/batched_background_migrations/backfill_organization_id_on_fork_networks.yml

@@ -5,4 +5,4 @@ feature_category: source_code_management
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/184051
 milestone: '17.11'
 queued_migration_version: 20250310143706
-finalized_by: # version of the migration that finalized this BBM
+finalized_by: 20250415100300

db/post_migrate/20250415100300_finalize_backfill_organization_id_on_fork_networks.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class FinalizeBackfillOrganizationIdOnForkNetworks < Gitlab::Database::Migration[2.2]
+  milestone '18.0'
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  def up
+    ensure_batched_background_migration_is_finished(
+      job_class_name: 'BackfillOrganizationIdOnForkNetworks',
+      table_name: :fork_networks,
+      column_name: :id,
+      job_arguments: [],
+      finalize: true
+    )
+  end
+
+  def down; end
+end