Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/assets/javascripts/deploy_freeze/store/mutations.js

@@ -1,4 +1,3 @@
-import Vue from 'vue';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import { formatTimezone } from '~/lib/utils/datetime_utility';
 import * as types from './mutation_types';
@@ -21,7 +20,7 @@ const setFreezePeriodIsDeleting = (state, id, isDeleting) => {
     return;
   }
 
-  Vue.set(freezePeriod, 'isDeleting', isDeleting);
+  freezePeriod.isDeleting = isDeleting;
 };
 
 export default {

app/assets/javascripts/projects/settings/components/access_dropdown.vue

@@ -20,7 +20,7 @@ export const i18n = {
   groupsSectionHeader: s__('AccessDropdown|Groups'),
   usersSectionHeader: s__('AccessDropdown|Users'),
   noRole: s__('AccessDropdown|No role'),
-  deployKeysSectionHeader: s__('AccessDropdown|Deploy Keys'),
+  deployKeysSectionHeader: s__('AccessDropdown|Deploy keys'),
   ownedBy: __('Owned by %{image_tag}'),
 };
 

app/assets/javascripts/work_items/components/work_item_ancestors/disclosure_hierarchy.vue

@@ -95,7 +95,7 @@ export default {
         <disclosure-hierarchy-item v-if="!isMobile" :item="firstItem" :item-id="itemId(0)">
           <slot :item="firstItem" :item-id="itemId(0)"></slot>
         </disclosure-hierarchy-item>
-        <li class="disclosure-hierarchy-item">
+        <li v-if="middleItems.length > 0" class="disclosure-hierarchy-item">
           <gl-disclosure-dropdown :items="middleItems">
             <template #toggle>
               <button

app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue

@@ -105,6 +105,7 @@ export default {
       workItemTypes: [],
       workItemsToAdd: [],
       error: null,
+      isInputValid: true,
       search: '',
       selectedProject: null,
       childToCreateTitle: null,
@@ -266,6 +267,7 @@ export default {
     },
     unsetError() {
       this.error = null;
+      this.isInputValid = true;
     },
     addChild() {
       this.submitInProgress = true;
@@ -291,6 +293,7 @@ export default {
         })
         .catch(() => {
           this.error = this.$options.i18n.addChildErrorMessage;
+          this.isInputValid = false;
         })
         .finally(() => {
           this.search = '';
@@ -325,6 +328,7 @@ export default {
         })
         .catch(() => {
           this.error = this.$options.i18n.createChildErrorMessage;
+          this.isInputValid = false;
         })
         .finally(() => {
           this.search = '';
@@ -361,11 +365,15 @@ export default {
           class="gl-w-full"
           :label="$options.i18n.titleInputLabel"
           :description="$options.i18n.titleInputValidationMessage"
+          :invalid-feedback="error"
+          :state="isInputValid"
+          data-testid="work-items-create-form-group"
         >
           <gl-form-input
             ref="wiTitleInput"
             v-model="search"
             :placeholder="$options.i18n.titleInputPlaceholder"
+            :state="isInputValid"
             maxlength="255"
             class="gl-mb-3"
             autofocus
@@ -389,7 +397,7 @@ export default {
         ref="confidentialityCheckbox"
         v-model="confidential"
         name="isConfidential"
-        class="gl-md-mt-5 gl-mb-5 gl-md-mb-3!"
+        class="gl-mb-5 gl-md-mb-3!"
         :disabled="parentConfidential"
         >{{ confidentialityCheckboxLabel }}</gl-form-checkbox
       >
@@ -417,7 +425,7 @@ export default {
       >
         {{ workItemsToAddInvalidMessage }}
       </div>
-      <div v-if="error" class="gl-text-red-500" data-testid="work-items-error">
+      <div v-if="error" class="gl-text-red-500 gl-mt-3" data-testid="work-items-error">
         {{ error }}
       </div>
     </div>

app/assets/javascripts/work_items/graphql/group_work_items.query.graphql

@@ -4,10 +4,22 @@ query groupWorkItems(
   $types: [IssueType!]
   $in: [IssuableSearchableField!]
   $includeAncestors: Boolean = false
+  $iid: String = null
+  $searchByIid: Boolean = false
+  $searchByText: Boolean = true
 ) {
   workspace: group(fullPath: $fullPath) {
     id
-    workItems(search: $searchTerm, types: $types, in: $in, includeAncestors: $includeAncestors) {
+    workItems(search: $searchTerm, types: $types, in: $in, includeAncestors: $includeAncestors)
+      @include(if: $searchByText) {
+      nodes {
+        id
+        iid
+        title
+        confidential
+      }
+    }
+    workItemsByIid: workItems(iid: $iid, types: $types) @include(if: $searchByIid) {
       nodes {
         id
         iid

app/controllers/jira_connect/branches_controller.rb

@@ -1,20 +1,17 @@
 # frozen_string_literal: true
 
 class JiraConnect::BranchesController < JiraConnect::ApplicationController
-  # before_action :authenticate_user!, only: :new
+  before_action :authenticate_user!, only: :new
   skip_before_action :verify_atlassian_jwt!, only: :new
 
   def new
-    # move authenticate_user! to a before_action when we remove the jira_connect_proxy_create_branch feature flag
-    authenticate_user! if Feature.enabled?(:jira_connect_proxy_create_branch, current_user)
-
     @new_branch_data = new_branch_data
   end
 
   # If the GitLab for Jira Cloud app was installed from the Jira marketplace and points to a self-managed instance,
   # we route the user to the self-managed instance, otherwise we redirect to :new
   def route
-    if Feature.enabled?(:jira_connect_proxy_create_branch, current_user) && current_jira_installation.proxy?
+    if current_jira_installation.proxy?
       redirect_to "#{current_jira_installation.create_branch_url}?#{request.query_string}"
 
       return

app/controllers/search_controller.rb

@@ -242,11 +242,11 @@ def payload_metadata
       metadata['meta.search.project_id'] = params[:project_id]
       metadata['meta.search.scope'] = params[:scope] || @scope
       metadata['meta.search.page'] = params[:page] || '1'
-      metadata['meta.search.filters.confidential'] = params[:confidential]
-      metadata['meta.search.filters.state'] = params[:state]
+      metadata['meta.search.filters.confidential'] = filter_params[:confidential]
+      metadata['meta.search.filters.state'] = filter_params[:state]
       metadata['meta.search.force_search_results'] = params[:force_search_results]
       metadata['meta.search.project_ids'] = params[:project_ids]
-      metadata['meta.search.filters.language'] = params[:language]
+      metadata['meta.search.filters.language'] = filter_params[:language]
       metadata['meta.search.type'] = @search_type if @search_type.present?
       metadata['meta.search.level'] = @search_level if @search_level.present?
       metadata[:global_search_duration_s] = @global_search_duration_s if @global_search_duration_s.present?
@@ -307,6 +307,10 @@ def tracking_project_source
   def search_type
     search_service.search_type
   end
+
+  def filter_params
+    params.permit(:confidential, :state, language: [])
+  end
 end
 
 SearchController.prepend_mod_with('SearchController')

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

@@ -1,13 +1,11 @@
-- add_to_breadcrumbs _('Deploy Keys'), admin_deploy_keys_path
-- page_title _('Edit Deploy Key')
+- add_to_breadcrumbs _('Deploy keys'), admin_deploy_keys_path
+- page_title _('Edit deploy key')
 
-%h1.page-title.gl-font-size-h-display= _('Edit public deploy key')
-%hr
+= render ::Layouts::PageHeadingComponent.new(_('Edit public deploy key'))
 
-%div
-  = gitlab_ui_form_for [:admin, @deploy_key], html: { class: 'deploy-key-form' } do |f|
-    = render partial: 'shared/deploy_keys/form', locals: { form: f, deploy_key: @deploy_key }
-    .form-actions
-      = f.submit _('Save changes'), pajamas_button: true
-      = render Pajamas::ButtonComponent.new(href: admin_deploy_keys_path) do
-        = _('Cancel')
+= gitlab_ui_form_for [:admin, @deploy_key], html: { class: 'deploy-key-form' } do |f|
+  = render partial: 'shared/deploy_keys/form', locals: { form: f, deploy_key: @deploy_key }
+  .gl-flex.gl-gap-3
+    = f.submit _('Save changes'), pajamas_button: true
+    = render Pajamas::ButtonComponent.new(href: admin_deploy_keys_path) do
+      = _('Cancel')

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

@@ -1,3 +1,5 @@
-- page_title _('Deploy Keys')
+- page_title _('Deploy keys')
+
+= render ::Layouts::PageHeadingComponent.new(_('Deploy keys'))
 
 #js-admin-deploy-keys-table{ data: admin_deploy_keys_data }

app/views/admin/deploy_keys/new.html.haml

@@ -1,11 +1,11 @@
-- add_to_breadcrumbs _('Deploy Keys'), admin_deploy_keys_path
-- page_title _('New Deploy Key')
+- add_to_breadcrumbs _('Deploy keys'), admin_deploy_keys_path
+- page_title _('New deploy key')
 
-%h1.page-title.gl-font-size-h-display= _('New public deploy key')
+= render ::Layouts::PageHeadingComponent.new(_('New public deploy key'))
 
 = gitlab_ui_form_for [:admin, @deploy_key], html: { class: 'deploy-key-form' } do |f|
   = render partial: 'shared/deploy_keys/form', locals: { form: f, deploy_key: @deploy_key }
-  .gl-display-flex.gl-mt-6.gl-gap-3
+  .gl-display-flex.gl-gap-3
     = f.submit 'Create', pajamas_button: true
     = render Pajamas::ButtonComponent.new(href: admin_deploy_keys_path) do
       = _('Cancel')

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

@@ -3,6 +3,6 @@
 
 = gitlab_ui_form_for [@project, @deploy_key], include_id: false, html: { class: 'js-requires-input' } do |f|
   = render partial: 'shared/deploy_keys/form', locals: { form: f, deploy_key: @deploy_key }
-  .gl-display-flex.gl-mt-6.gl-gap-3
+  .gl-display-flex.gl-gap-3
     = f.submit _('Save changes'), pajamas_button: true
     = link_button_to _('Cancel'), project_settings_repository_path(@project, anchor: 'js-deploy-keys-settings')

config/feature_flags/gitlab_com_derisk/jira_connect_proxy_create_branch.yml

@@ -226,7 +226,7 @@ We should treat this similar to adding a new worker. That means we only start sc
    To ensure backward and forward compatibility between consecutive versions
 of the application, follow these steps over three minor releases:
 
-1. Create the newly named worker, and have the old worker call the new worker's `#perform` method. Inroduce a feature flag to control when we start scheduling the new worker. (Release M)
+1. Create the newly named worker, and have the old worker call the new worker's `#perform` method. Introduce a feature flag to control when we start scheduling the new worker. (Release M)
 
     Any old worker jobs that are still in the queue will delegate to the new worker. When this version is deployed, it is no longer relevant which version of the job is scheduled or which Sidekiq handles it, an old-Sidekiq will use the old worker's full implementation, a new-Sidekiq will delegate to the new worker.
 

doc/development/sidekiq/compatibility_across_updates.md

@@ -132,12 +132,16 @@ If you need to perform an action when a job fails after all of its retry attempt
 
 ```ruby
 sidekiq_retries_exhausted do |msg, ex|
-  project = Project.find(msg['args'].first)
+  project = Project.find_by_id(msg['args'].first)
+  return unless project
+
   project.perform_a_rollback # handle the permanent failure
 end
 
 def perform(project_id)
-  project = Project.find(project_id)
+  project = Project.find_by_id(project_id)
+  return unless project
+
   project.some_action # throws an exception
 end
 ```

doc/development/sidekiq/index.md

@@ -37,7 +37,6 @@ This table shows the features available with the Jira DVCS connector and the Git
 | Sync deployments                     | **{dotted-circle}** No | **{check-circle}** Yes    |
 | Sync feature flags                   | **{dotted-circle}** No | **{check-circle}** Yes    |
 | Sync interval                        | Up to 60 minutes       | Real time                 |
-| Create branches                      | **{dotted-circle}** No | **{check-circle}** Yes (GitLab.com only) |
 | Delete branches                      | **{dotted-circle}** No | **{check-circle}** Yes    |
 | Create a merge request from a branch | **{check-circle}** Yes | **{check-circle}** Yes    |
 | Create a branch from a Jira issue    | **{dotted-circle}** No | **{check-circle}** Yes    |

doc/integration/jira/development_panel.md

@@ -46,7 +46,7 @@ The adjustments help limit pushes to established and authorized users.
 ## Deploy keys
 
 1. On the left sidebar, at the bottom, select **Admin area**.
-1. Select **Deploy Keys**.
+1. Select **Deploy keys**.
 
 Public deploy keys at are used to give read or read/write access to
 **all** projects on the instance, and are intended for remote automation to access

doc/security/hardening_application_recommendations.md

@@ -120,7 +120,7 @@ Prerequisites:
 To create a public deploy key:
 
 1. On the left sidebar, at the bottom, select **Admin area**.
-1. Select **Deploy Keys**.
+1. Select **Deploy keys**.
 1. Select **New deploy key**.
 1. Complete the fields.
    - Use a meaningful description for **Name**. For example, include the name of the external host

doc/user/project/deploy_keys/index.md

@@ -173,6 +173,7 @@ When creating a workspace in a project, one of the following errors might occur:
 - `You can't create a workspace for this project` when you attempt to create the workspace from **Workspaces** on the left sidebar.
 - `To set up this feature, contact your administrator.` when you attempt to create the workspace in a specific project using the `Edit` function.
 - An expected agent is not be present in the list of available agents.
+
 Possible reasons for this error are:
 
 - The user does not have at least Developer role for the workspace project and/or the agent project. To resolve this issue, ask the respective group or project owner to grant you access.

doc/user/workspace/configuration.md

@@ -18,7 +18,7 @@ class Params
       alias_method :term, :query_string
 
       def initialize(params, detect_abuse: true)
-        @raw_params      = convert_all_boolean_params(params)
+        @raw_params      = process_params(params)
         @query_string    = strip_surrounding_whitespace(@raw_params[:search] || @raw_params[:term])
         @detect_abuse    = detect_abuse
         @abuse_detection = AbuseDetection.new(self) if @detect_abuse
@@ -94,6 +94,22 @@ def strip_surrounding_whitespace(obj)
         obj.to_s.strip
       end
 
+      def process_params(params)
+        processed_params = convert_all_boolean_params(params)
+        convert_not_params(processed_params)
+      end
+
+      def convert_not_params(params)
+        not_params = params.delete(:not)
+        return params unless not_params
+
+        not_params.each do |key, value|
+          params[:"not_#{key}"] = value
+        end
+
+        params
+      end
+
       def convert_all_boolean_params(params)
         converted_params = params.is_a?(Hash) ? params.with_indifferent_access : params.dup
 

lib/gitlab/search/params.rb

@@ -11,7 +11,7 @@ def link
 
         override :title
         def title
-          s_('Admin|Deploy Keys')
+          s_('Admin|Deploy keys')
         end
 
         override :sprite_icon