From e48c28ed86567f049865a590fdda4569a760ee1f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 26 Oct 2021 09:09:57 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/rails.gitlab-ci.yml | 1 - .gitlab/ci/rules.gitlab-ci.yml | 8 +- .gitpod.yml | 4 +- .../components/board_content_sidebar.vue | 3 +- .../diffs/components/commit_item.vue | 12 +- .../javascripts/issue_show/constants.js | 5 + .../repository/components/last_commit.vue | 19 ++- app/assets/javascripts/right_sidebar.js | 7 +- .../components/labels/sidebar_labels.vue | 3 +- .../components/sidebar_editable_item.vue | 2 +- app/assets/javascripts/sidebar/constants.js | 23 +-- .../labels_select_vue/dropdown_contents.vue | 1 + .../sidebar/labels_select_widget/constants.js | 5 +- .../dropdown_contents.vue | 16 +- .../dropdown_contents_create_view.vue | 27 ++-- .../dropdown_contents_labels_view.vue | 8 +- .../graphql/create_label.mutation.graphql | 7 +- .../graphql/epic_labels.query.graphql | 7 +- .../epic_update_labels.mutation.graphql | 15 ++ .../graphql/group_labels.query.graphql | 7 +- .../graphql/issue_labels.query.graphql | 7 +- .../graphql/project_labels.query.graphql | 7 +- .../labels_select_root.vue | 69 ++++++-- app/mailers/emails/members.rb | 6 +- app/models/ci/build_metadata.rb | 1 + app/models/concerns/ci/metadatable.rb | 1 - .../member_access_denied_email.html.haml | 9 +- ...ign_resource_from_resource_group_worker.rb | 2 +- config/environments/test.rb | 2 +- ...e_runner_features_to_ci_builds_metadata.rb | 9 ++ ...i_builds_on_name_and_id_parser_features.rb | 26 +++ db/schema_migrations/20211013125341 | 1 + db/schema_migrations/20211020030948 | 1 + db/structure.sql | 5 +- doc/ci/services/index.md | 2 +- doc/ci/yaml/index.md | 53 +++--- doc/development/secure_coding_guidelines.md | 87 ++++++++++ .../testing_guide/best_practices.md | 14 ++ .../img/vulnerability-check_v14_2.png | Bin 23147 -> 0 bytes doc/user/application_security/index.md | 153 +++++++++--------- doc/user/packages/container_registry/index.md | 4 +- lib/gitlab/ci/templates/Django.gitlab-ci.yml | 118 ++++++++------ .../dropdown_contents_create_view_spec.js | 19 +-- .../dropdown_contents_labels_view_spec.js | 2 + .../dropdown_contents_spec.js | 3 +- .../labels_select_root_spec.js | 3 +- .../sidebar/labels_select_widget/mock_data.js | 4 + spec/mailers/notify_spec.rb | 35 ++-- spec/models/ci/bridge_spec.rb | 2 - spec/models/ci/build_spec.rb | 1 - ...esource_from_resource_group_worker_spec.rb | 4 + 51 files changed, 570 insertions(+), 260 deletions(-) create mode 100644 app/assets/javascripts/vue_shared/components/sidebar/labels_select_widget/graphql/epic_update_labels.mutation.graphql create mode 100644 db/migrate/20211020030948_add_runtime_runner_features_to_ci_builds_metadata.rb create mode 100644 db/post_migrate/20211013125341_create_index_security_ci_builds_on_name_and_id_parser_features.rb create mode 100644 db/schema_migrations/20211013125341 create mode 100644 db/schema_migrations/20211020030948 delete mode 100644 doc/user/application_security/img/vulnerability-check_v14_2.png diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index b85a0f6c1e8..983cebd2b43 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -168,7 +168,6 @@ setup-test-env: - .rails:rules:code-backstage-qa stage: prepare variables: - GITLAB_TEST_EAGER_LOAD: "0" SETUP_DB: "false" script: - run_timed_command "scripts/setup-test-env" diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 283fd0ddb76..a3d1716f1d0 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -381,8 +381,8 @@ - "config/helpers/**/*.js" - "vendor/assets/javascripts/**/*" -.feature-flag-config-patterns: &feature-flag-config-patterns - - "{,ee/}config/feature_flags/**/*.yml" +.feature-flag-development-config-patterns: &feature-flag-development-config-patterns + - "{,ee/}config/feature_flags/development/*.yml" ################ # Shared rules # @@ -686,7 +686,7 @@ - <<: *if-not-ee when: never - <<: *if-dot-com-gitlab-org-and-security-merge-request - changes: *feature-flag-config-patterns + changes: *feature-flag-development-config-patterns when: never - <<: *if-dot-com-gitlab-org-and-security-merge-request changes: *ci-qa-patterns @@ -706,7 +706,7 @@ - <<: *if-not-ee when: never - <<: *if-dot-com-gitlab-org-and-security-merge-request - changes: *feature-flag-config-patterns + changes: *feature-flag-development-config-patterns when: manual allow_failure: true diff --git a/.gitpod.yml b/.gitpod.yml index d546cc7f64a..c9adad3e3fe 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -69,15 +69,13 @@ tasks: printf "Waiting for GitLab at $(gp url 3000) ..." # Check /-/readiness which returns JSON, but we're only interested in the exit code # - # We use http://localhost:3000 instead of the public hostname because + # We use http://localhost:3000 instead of the public hostname because # it's no longer possible to access as specific cookies are required until curl --silent --no-buffer --fail http://localhost:3000/-/readiness > /dev/null 2>&1; do printf '.'; sleep 5; done && echo "" # Give Gitpod a few more seconds to set up everything ... sleep 5 printf "$(date) – GitLab is up (took ~%.1f minutes)\n" "$((10*$SECONDS/60))e-1" | tee -a /workspace/startup.log gp preview $(gp url 3000) || true - # Speed up backend tests - export GITLAB_TEST_EAGER_LOAD=false ) ports: diff --git a/app/assets/javascripts/boards/components/board_content_sidebar.vue b/app/assets/javascripts/boards/components/board_content_sidebar.vue index d9d18dc0079..63334e7b4d1 100644 --- a/app/assets/javascripts/boards/components/board_content_sidebar.vue +++ b/app/assets/javascripts/boards/components/board_content_sidebar.vue @@ -214,8 +214,9 @@ export default { :labels-create-title="createLabelTitle" :labels-filter-base-path="projectPathForActiveIssue" :attr-workspace-path="attrWorkspacePath" + workspace-type="project" :issuable-type="issuableType" - :label-type="labelType" + :label-create-type="labelType" @onLabelRemove="handleLabelRemove" @updateSelectedLabels="handleUpdateSelectedLabels" > diff --git a/app/assets/javascripts/diffs/components/commit_item.vue b/app/assets/javascripts/diffs/components/commit_item.vue index 4435a533591..e54fde72847 100644 --- a/app/assets/javascripts/diffs/components/commit_item.vue +++ b/app/assets/javascripts/diffs/components/commit_item.vue @@ -1,5 +1,5 @@ @@ -101,7 +105,7 @@ export default { >
· {{ commit.short_id }} @@ -174,9 +178,9 @@ export default { 

     

   
diff --git a/app/assets/javascripts/issue_show/constants.js b/app/assets/javascripts/issue_show/constants.js
index 4e167828c3b..ef9699deb42 100644
--- a/app/assets/javascripts/issue_show/constants.js
+++ b/app/assets/javascripts/issue_show/constants.js
@@ -39,3 +39,8 @@ export const IncidentType = 'incident';
 export const issueState = { issueType: undefined, isDirty: false };
 
 export const POLLING_DELAY = 2000;
+
+export const WorkspaceType = {
+  project: 'project',
+  group: 'group',
+};
diff --git a/app/assets/javascripts/repository/components/last_commit.vue b/app/assets/javascripts/repository/components/last_commit.vue
index 5c713796bd6..62066973ee6 100644
--- a/app/assets/javascripts/repository/components/last_commit.vue
+++ b/app/assets/javascripts/repository/components/last_commit.vue
@@ -1,5 +1,12 @@
 
 
@@ -121,10 +132,10 @@ export default {
       

         

           
           
           

         

         

           

           

              {
-    $block.find('.js-sidebar-dropdown-toggle').trigger('click');
-  });
+    if (!gon.features?.labelsWidget && !$block.hasClass('labels-select-wrapper')) {
+      $block.find('.js-sidebar-dropdown-toggle').trigger('click');
+    }
+  }, DEBOUNCE_DROPDOWN_DELAY);
 };
 
 Sidebar.prototype.setCollapseAfterUpdate = function ($block) {
diff --git a/app/assets/javascripts/sidebar/components/labels/sidebar_labels.vue b/app/assets/javascripts/sidebar/components/labels/sidebar_labels.vue
index 4c08419bb88..5cd4a1a5192 100644
--- a/app/assets/javascripts/sidebar/components/labels/sidebar_labels.vue
+++ b/app/assets/javascripts/sidebar/components/labels/sidebar_labels.vue
@@ -158,8 +158,9 @@ export default {
     :labels-filter-base-path="projectIssuesPath"
     :variant="$options.variant"
     :issuable-type="issuableType"
+    workspace-type="project"
     :attr-workspace-path="fullPath"
-    :label-type="LabelType.project"
+    :label-create-type="LabelType.project"
     data-qa-selector="labels_block"
   >
     {{ __('None') }}
diff --git a/app/assets/javascripts/sidebar/components/sidebar_editable_item.vue b/app/assets/javascripts/sidebar/components/sidebar_editable_item.vue
index 22adbd79ef6..056b3e98a1c 100644
--- a/app/assets/javascripts/sidebar/components/sidebar_editable_item.vue
+++ b/app/assets/javascripts/sidebar/components/sidebar_editable_item.vue
@@ -134,7 +134,7 @@ export default {
         v-if="canUpdate && !initialLoading && canEdit"
         category="tertiary"
         size="small"
-        class="gl-text-gray-900! gl-ml-auto hide-collapsed gl-mr-n2"
+        class="gl-text-gray-900! gl-ml-auto hide-collapsed gl-mr-n2 shortcut-sidebar-dropdown-toggle"
         data-testid="edit-button"
         :data-track-action="tracking.event"
         :data-track-label="tracking.label"
diff --git a/app/assets/javascripts/sidebar/constants.js b/app/assets/javascripts/sidebar/constants.js
index 02843dd3c5b..61f8fce034d 100644
--- a/app/assets/javascripts/sidebar/constants.js
+++ b/app/assets/javascripts/sidebar/constants.js
@@ -1,5 +1,5 @@
 import updateIssueLabelsMutation from '~/boards/graphql/issue_set_labels.mutation.graphql';
-import { IssuableType } from '~/issue_show/constants';
+import { IssuableType, WorkspaceType } from '~/issue_show/constants';
 import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants';
 import epicConfidentialQuery from '~/sidebar/queries/epic_confidential.query.graphql';
 import epicDueDateQuery from '~/sidebar/queries/epic_due_date.query.graphql';
@@ -34,6 +34,7 @@ import updateMergeRequestLabelsMutation from '~/sidebar/queries/update_merge_req
 import updateMergeRequestSubscriptionMutation from '~/sidebar/queries/update_merge_request_subscription.mutation.graphql';
 import updateAlertAssigneesMutation from '~/vue_shared/alert_details/graphql/mutations/alert_set_assignees.mutation.graphql';
 import epicLabelsQuery from '~/vue_shared/components/sidebar/labels_select_widget/graphql/epic_labels.query.graphql';
+import updateEpicLabelsMutation from '~/vue_shared/components/sidebar/labels_select_widget/graphql/epic_update_labels.mutation.graphql';
 import groupLabelsQuery from '~/vue_shared/components/sidebar/labels_select_widget/graphql/group_labels.query.graphql';
 import issueLabelsQuery from '~/vue_shared/components/sidebar/labels_select_widget/graphql/issue_labels.query.graphql';
 import projectLabelsQuery from '~/vue_shared/components/sidebar/labels_select_widget/graphql/project_labels.query.graphql';
@@ -111,19 +112,18 @@ export const referenceQueries = {
   },
 };
 
-export const labelsQueries = {
-  [IssuableType.Issue]: {
-    issuableQuery: issueLabelsQuery,
-    workspaceQuery: projectLabelsQuery,
+export const workspaceLabelsQueries = {
+  [WorkspaceType.project]: {
+    query: projectLabelsQuery,
   },
-  [IssuableType.Epic]: {
-    issuableQuery: epicLabelsQuery,
-    workspaceQuery: groupLabelsQuery,
+  [WorkspaceType.group]: {
+    query: groupLabelsQuery,
   },
 };
 
-export const labelsMutations = {
+export const issuableLabelsQueries = {
   [IssuableType.Issue]: {
+    issuableQuery: issueLabelsQuery,
     mutation: updateIssueLabelsMutation,
     mutationName: 'updateIssue',
   },
@@ -131,6 +131,11 @@ export const labelsMutations = {
     mutation: updateMergeRequestLabelsMutation,
     mutationName: 'mergeRequestSetLabels',
   },
+  [IssuableType.Epic]: {
+    issuableQuery: epicLabelsQuery,
+    mutation: updateEpicLabelsMutation,
+    mutationName: 'updateEpic',
+  },
 };
 
 export const dateTypes = {
diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents.vue
index d80b66fd9be..399db978b60 100644
--- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents.vue
+++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents.vue
@@ -36,6 +36,7 @@ export default {