Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/ci/package-and-test-nightly/main.gitlab-ci.yml

@@ -199,6 +199,20 @@ gitlab-pages:
     - if: $QA_SUITES =~ /Test::Instance::GitlabPages/
     - !reference [.rules:test:manual, rules]
 
+# ========== git sha256 enabled ===========
+git-sha256-repositories:
+  when: manual
+  extends:
+    - .parallel
+    - .qa
+  variables:
+    QA_SCENARIO: Test::Instance::Image
+    QA_USE_SHA256_REPOSITORY_OBJECT_STORAGE: true
+    GITLAB_QA_OPTS: "--enable-feature support_sha256_repositories"
+  rules:
+    - !reference [.rules:test:qa-parallel, rules]
+    - if: $QA_SUITES =~ /Test::Instance::All/
+
 # ==========================================
 # Post test stage
 # ==========================================

.gitlab/ci/package-and-test/main.gitlab-ci.yml

@@ -192,6 +192,22 @@ gitaly-transactions-selective-parallel:
       variables:
         QA_TESTS: ""
 
+# ========== git sha256 enabled ===========
+git-sha256-repositories:
+  when: manual
+  extends:
+    - .parallel
+    - .qa
+  parallel: 5
+  variables:
+    QA_SCENARIO: Test::Instance::Image
+    QA_USE_SHA256_REPOSITORY_OBJECT_STORAGE: true
+    GITLAB_QA_OPTS: "--enable-feature support_sha256_repositories"
+  rules:
+    - !reference [.rules:test:smoke-for-omnibus-mr, rules]
+    - !reference [.rules:test:feature-flags-set, rules]
+    - !reference [.rules:test:qa-parallel, rules]
+    - if: $QA_SUITES =~ /Test::Instance::All/
 # ------------------------------------------
 # Non parallel jobs
 # ------------------------------------------

.yamllint

@@ -27,9 +27,6 @@ ignore: |
   # Has some special indentation
   doc/user/project/integrations/samples/cloudwatch.yml
 
-  # Broken on purpose (for testing)
-  spec/fixtures/lib/gitlab/metrics/dashboard/broken_yml_syntax.yml
-
   # Dynamic YAML files have syntax errors sometimes.
   *.erb
 

GITALY_SERVER_VERSION

@@ -1 +1 @@
-e9200d13237f94877ae69dd6391b23d5ca1402e8
+67840bedbf1fda223cbb9ebae021db71c31b69aa

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

@@ -1,18 +1,18 @@
 <script>
 import { isEmpty } from 'lodash';
-import { GlCard, GlIcon, GlButton } from '@gitlab/ui';
+import { GlButton } from '@gitlab/ui';
 import { __, s__ } from '~/locale';
 import { scrollToElement } from '~/lib/utils/common_utils';
+import CrudComponent from '~/vue_shared/components/crud_component.vue';
 import { CUSTOM_HEADER_KEY_PATTERN } from '../constants';
 import FormCustomHeaderItem from './form_custom_header_item.vue';
 
 const MAXIMUM_CUSTOM_HEADERS = 20;
 
 export default {
   components: {
+    CrudComponent,
     FormCustomHeaderItem,
-    GlCard,
-    GlIcon,
     GlButton,
   },
   props: {
@@ -100,21 +100,15 @@ export default {
 </script>
 
 <template>
-  <gl-card
+  <crud-component
     ref="customHeaderCard"
+    :title="s__('Webhooks|Custom headers')"
+    icon="code"
+    :count="customHeaders.length"
+    class="gl-mt-3 gl-mb-5"
     data-testid="custom-headers-card"
-    class="gl-new-card gl-my-4"
-    header-class="gl-new-card-header"
-    body-class="gl-new-card-body gl-px-5 gl-py-4"
   >
-    <template #header>
-      <div class="gl-new-card-title-wrapper">
-        <h3 class="gl-new-card-title">{{ s__('Webhooks|Custom headers') }}</h3>
-        <div class="gl-new-card-count">
-          <gl-icon name="code" class="gl-mr-2" />
-          {{ customHeaders.length }}
-        </div>
-      </div>
+    <template #actions>
       <gl-button
         v-if="!maximumCustomHeadersReached"
         size="small"
@@ -147,5 +141,5 @@ export default {
     <span v-if="customHeaders.length === 0" class="gl-text-secondary">
       {{ s__('Webhooks|No custom headers configured.') }}
     </span>
-  </gl-card>
+  </crud-component>
 </template>

app/components/layouts/crud_component.haml

@@ -15,7 +15,7 @@
             = description || @description
       .gl-flex.gl-gap-3.gl-items-baseline{ data: { testid: 'crud-actions' } }
         - if @toggle_text
-          = render Pajamas::ButtonComponent.new(size: :small, button_options: button_options_attrs) do
+          = render Pajamas::ButtonComponent.new(size: :small, button_options: toggle_button_options_attrs) do
             = @toggle_text
         = actions
 

app/components/layouts/crud_component.rb

@@ -43,7 +43,7 @@ def body_options_attrs
       @body_options.merge(default_attrs(@body_options, default_testid, default_classes))
     end
 
-    def button_options_attrs
+    def toggle_button_options_attrs
       default_testid = 'crud-action-toggle'
       default_classes = ['js-toggle-button js-toggle-content']
       @toggle_options.merge(default_attrs(@toggle_options, default_testid, default_classes))
@@ -53,7 +53,7 @@ def form_options_attrs
       default_testid = 'crud-form'
       default_classes = [
         ('js-toggle-content' if @toggle_text),
-        ('gl-hidden' if @toggle_text && !@form_options[:class])
+        ('gl-hidden' if @toggle_text && !@form_options[:form_errors])
       ]
       @form_options.merge(default_attrs(@form_options, default_testid, default_classes))
     end

app/components/layouts/settings_section_component.rb

@@ -7,12 +7,12 @@ class SettingsSectionComponent < ViewComponent::Base
     # @param [String] id
     # @param [String] testid
     # @param [Hash] options
-    def initialize(heading, description: nil, id: nil, testid: nil, options: nil)
+    def initialize(heading, description: nil, id: nil, testid: nil, options: {})
       @heading = heading
       @description = description
       @id = id
       @testid = testid
-      @options = options || {}
+      @options = options
     end
 
     renders_one :heading

app/controllers/application_controller.rb

@@ -534,7 +534,9 @@ def set_current_organization
     return if ::Current.lock_organization
 
     ::Current.organization = Gitlab::Current::Organization.new(
-      params: params.permit(:controller, :namespace_id, :group_id, :id),
+      params: params.permit(
+        :controller, :namespace_id, :group_id, :id, :organization_path
+      ),
       user: current_user
     ).organization
   end

app/models/organizations/organization.rb

@@ -13,7 +13,7 @@ class Organization < MainClusterwide::ApplicationRecord
       joins(namespaces: :route).where(route: { path: path.to_s })
     }
     scope :with_user, ->(user) {
-      joins(:users).where(users: user).order(Arel.sql('organization_users.id asc'))
+      joins(:organization_users).merge(Organizations::OrganizationUser.by_user(user).order(:id))
     }
 
     before_destroy :check_if_default_organization

app/models/organizations/organization_user.rb

@@ -20,6 +20,7 @@ class OrganizationUser < ApplicationRecord
     scope :owners, -> { where(access_level: Gitlab::Access::OWNER) }
     scope :in_organization, ->(organization) { where(organization: organization) }
     scope :with_active_users, -> { joins(:user).merge(User.active) }
+    scope :by_user, ->(user) { where(user: user) }
 
     def self.create_default_organization_record_for(user_id, user_is_admin:)
       upsert(

app/models/snippet.rb

@@ -20,6 +20,9 @@ class Snippet < ApplicationRecord
   include CreatedAtFilterable
   include EachBatch
   include Import::HasImportSource
+  include SafelyChangeColumnDefault
+
+  columns_changing_default :organization_id
 
   MAX_FILE_COUNT = 10
 

app/services/bulk_imports/file_download_service.rb

@@ -49,7 +49,7 @@ def execute
     private
 
     attr_reader :configuration, :relative_url, :tmpdir, :file_size_limit, :allowed_content_types,
-      :response_headers, :last_chunk_context, :response_code
+      :response_headers, :response_code
 
     def download_file
       File.open(filepath, 'wb') do |file|
@@ -67,7 +67,7 @@ def download_file
 
           @response_code = chunk.code
           @response_headers ||= Gitlab::HTTP::Response::Headers.new(chunk.http_response.to_hash)
-          @last_chunk_context = chunk.to_s.truncate(LAST_CHUNK_CONTEXT_CHAR_LIMIT)
+          @last_chunk_context = chunk
 
           unless @remote_content_validated
             validate_content_type
@@ -141,5 +141,11 @@ def validate_url
     def default_file_size_limit
       Gitlab::CurrentSettings.current_application_settings.bulk_import_max_download_file_size.megabytes
     end
+
+    # Before logging, we truncate the context to a reasonable length and scrub
+    # any non-printable characters.
+    def last_chunk_context
+      @last_chunk_context.to_s.truncate(LAST_CHUNK_CONTEXT_CHAR_LIMIT).scrub
+    end
   end
 end

app/views/admin/applications/index.html.haml

@@ -16,7 +16,10 @@
       = s_('AdminArea|Manage applications for your instance that can use GitLab as an OAuth provider, start by creating a new one above.')
 
 - else
-  = render ::Layouts::CrudComponent.new(s_('AdminArea|Instance OAuth applications'), icon: 'applications', count: @applications.size, options: { class: 'gl-mt-5' }) do |c|
+  = render ::Layouts::CrudComponent.new(s_('AdminArea|Instance OAuth applications'),
+    icon: 'applications',
+    count: @applications.size,
+    options: { class: 'gl-mt-5', data: { testid: 'oauth-applications' } }) do |c|
     - c.with_description do
       - docs_link_path = help_page_path('integration/oauth_provider')
       - docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer nofollow">'.html_safe % { url: docs_link_path }
@@ -34,7 +37,7 @@
               %th= _('Trusted')
               %th= _('Confidential')
               %th.gl-text-right= _('Actions')
-          %tbody{ data: { testid: "oauth-applications" } }
+          %tbody
             - @applications.each do |application|
               %tr{ id: "application_#{application.id}" }
                 %td{ data: { label: _('Name') } }= link_to application.name, admin_application_path(application)

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

@@ -3,18 +3,18 @@
 
 = render 'shared/web_hooks/hook_errors', hook: @hook
 
-.gl-mt-5
-  = render 'shared/web_hooks/title_and_docs', hook: @hook
+= render ::Layouts::SettingsSectionComponent.new(page_title) do |c|
+  - c.with_description do
+    = render 'shared/web_hooks/description', hook: @hook
+  - c.with_body do
+    = gitlab_ui_form_for @hook, as: :hook, url: admin_hook_path do |f|
+      = render partial: 'form', locals: { form: f, hook: @hook }
 
-  = gitlab_ui_form_for @hook, as: :hook, url: admin_hook_path do |f|
-    = render partial: 'form', locals: { form: f, hook: @hook }
-
-    .gl-display-flex.gl-justify-content-space-between
-      %div
-        = f.submit _('Save changes'), pajamas_button: true, class: 'gl-sm-mr-3'
+      .settings-sticky-footer
+        = f.submit _('Save changes'), pajamas_button: true, class: 'gl-mr-2'
         = render 'shared/web_hooks/test_button', hook: @hook
-      = link_button_to _('Delete'), admin_hook_path(@hook), method: :delete, aria: { label: s_('Webhooks|Delete webhook') }, data: { confirm: s_('Webhooks|Are you sure you want to delete this webhook?'), confirm_btn_variant: 'danger' }, variant: :danger
+        = link_button_to _('Delete'), admin_hook_path(@hook), method: :delete, class: 'gl-float-right', aria: { label: s_('Webhooks|Delete webhook') }, data: { confirm: s_('Webhooks|Are you sure you want to delete this webhook?'), confirm_btn_variant: 'danger' }, variant: :danger
 
-%hr
+    %hr
 
-= render partial: 'shared/hook_logs/index', locals: { hook: @hook, hook_logs: @hook_logs }
+    = render partial: 'shared/hook_logs/index', locals: { hook: @hook, hook_logs: @hook_logs }

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

@@ -1,7 +1,9 @@
 - page_title @hook.pluralized_name
 
-.settings-section{ data: { event_tracking_load: 'true', event_tracking: 'view_admin_hooks_pageload' } }
-  = render 'shared/web_hooks/title_and_docs', hook: @hook
-  = render 'shared/web_hooks/index', hooks: @hooks, title: @hook.pluralized_name, partial: 'form', url: admin_hooks_path
+= render ::Layouts::SettingsSectionComponent.new(page_title, options: { data: { event_tracking_load: 'true', event_tracking: 'view_admin_hooks_pageload' } }) do |c|
+  - c.with_description do
+    = render 'shared/web_hooks/description', hook: @hook
+  - c.with_body do
+    = render 'shared/web_hooks/index', hooks: @hooks, title: @hook.pluralized_name, partial: 'form', url: admin_hooks_path
 
 = render 'shared/file_hooks/index'

app/views/groups/settings/applications/edit.html.haml

@@ -1,4 +1,4 @@
 - page_title _("Edit"), @application.name, _("Group applications")
 
-%h1.page-title.gl-font-size-h-display= _('Edit group application')
+= render ::Layouts::PageHeadingComponent.new(_('Edit group application'))
 = render 'shared/doorkeeper/applications/form', url: group_settings_application_path(@group, @application)

app/views/groups/settings/applications/show.html.haml

@@ -2,9 +2,7 @@
 - breadcrumb_title @application.name
 - page_title @application.name, _("Group applications")
 
-%h1.page-title.gl-font-size-h-display
-  = _("Group application: %{name}") % { name: @application.name }
-
+= render ::Layouts::PageHeadingComponent.new(safe_format(_("Group application: %{name}"), name: @application.name))
 = render 'shared/doorkeeper/applications/show',
   edit_path: edit_group_settings_application_path(@group, @application),
   delete_path: group_settings_application_path(@group, @application),

app/views/projects/hooks/edit.html.haml

@@ -3,17 +3,18 @@
 
 = render 'shared/web_hooks/hook_errors', hook: @hook
 
-.gl-mt-5
-  = render 'shared/web_hooks/title_and_docs', hook: @hook
+= render ::Layouts::SettingsSectionComponent.new(page_title) do |c|
+  - c.with_description do
+    = render 'shared/web_hooks/description', hook: @hook
+  - c.with_body do
+    = gitlab_ui_form_for [@project, @hook], as: :hook, url: project_hook_path(@project, @hook), html: { class: 'js-webhook-form' } do |f|
+      = render partial: 'shared/web_hooks/form', locals: { form: f, hook: @hook }
 
-  = gitlab_ui_form_for [@project, @hook], as: :hook, url: project_hook_path(@project, @hook), html: { class: 'js-webhook-form' } do |f|
-    = render partial: 'shared/web_hooks/form', locals: { form: f, hook: @hook }
+      .settings-sticky-footer
+        = f.submit _('Save changes'), pajamas_button: true, class: 'gl-mr-2'
+        = render 'shared/web_hooks/test_button', hook: @hook
+        = link_button_to _('Delete'), project_hook_path(@project, @hook), method: :delete, class: 'gl-float-right', aria: { label: s_('Webhooks|Delete webhook') }, data: { confirm: s_('Webhooks|Are you sure you want to delete this project hook?'), confirm_btn_variant: 'danger' }, variant: :danger
 
-    %div
-      = f.submit _('Save changes'), pajamas_button: true, class: 'gl-sm-mr-3'
-      = render 'shared/web_hooks/test_button', hook: @hook
-      = link_button_to _('Delete'), project_hook_path(@project, @hook), method: :delete, class: 'gl-float-right', aria: { label: s_('Webhooks|Delete webhook') }, data: { confirm: s_('Webhooks|Are you sure you want to delete this project hook?'), confirm_btn_variant: 'danger' }, variant: :danger
+    %hr
 
-%hr
-
-= render partial: 'shared/hook_logs/index', locals: { hook: @hook, hook_logs: @hook_logs, project: @project }
+    = render partial: 'shared/hook_logs/index', locals: { hook: @hook, hook_logs: @hook_logs, project: @project }

app/views/projects/hooks/index.html.haml

@@ -2,6 +2,9 @@
 - page_title _('Webhooks')
 - @force_desktop_expanded_sidebar = true
 
-.gl-mt-3.js-search-settings-section
-  = render 'shared/web_hooks/title_and_docs', hook: @hook
-  = render 'shared/web_hooks/index', hooks: @hooks, title: @hook.pluralized_name, partial: 'shared/web_hooks/form', url: polymorphic_path([@project, :hooks])
+.js-search-settings-section
+  = render ::Layouts::SettingsSectionComponent.new(page_title) do |c|
+    - c.with_description do
+      = render 'shared/web_hooks/description', hook: @hook
+    - c.with_body do
+      = render 'shared/web_hooks/index', hooks: @hooks, title: @hook.pluralized_name, partial: 'shared/web_hooks/form', url: polymorphic_path([@project, :hooks])