.gitlab/ci/qa.gitlab-ci.yml

@@ -73,8 +73,7 @@ populate-qa-tests-var:
   image: ${GITLAB_DEPENDENCY_PROXY}ruby:2.7-alpine
   stage: prepare
   script:
-    - tooling/bin/qa/check_if_qa_only_spec_changes ${CHANGES_FILE} ${ONLY_QA_CHANGES_FILE}
-    - '[ -f $ONLY_QA_CHANGES_FILE ] && export QA_TESTS="`cat $ONLY_QA_CHANGES_FILE`"'
+    - export QA_TESTS=$(scripts/determine-qa-tests --files $CHANGES_FILE --labels $CI_MERGE_REQUEST_LABELS)
     - 'echo "QA_TESTS=$QA_TESTS" >> qa_tests_var.env'
     - 'echo "QA_TESTS: $QA_TESTS"'
   artifacts:
@@ -83,11 +82,9 @@ populate-qa-tests-var:
       dotenv: qa_tests_var.env
     paths:
       - ${CHANGES_FILE}
-      - ${ONLY_QA_CHANGES_FILE}
       - qa_tests_var.env
   variables:
     CHANGES_FILE: tmp/changed_files.txt
-    ONLY_QA_CHANGES_FILE: tmp/qa_only_changed_files.txt
   needs:
     - detect-tests
 

.gitlab/ci/rails.gitlab-ci.yml

@@ -609,17 +609,16 @@ rspec:undercoverage:
   stage: post-test
   needs: ["rspec:coverage"]
   script:
-    - if [ -n "$CI_MERGE_REQUEST_SOURCE_BRANCH_SHA" ]; then
-        echo "Checking out \$CI_MERGE_REQUEST_SOURCE_BRANCH_SHA ($CI_MERGE_REQUEST_SOURCE_BRANCH_SHA) instead of \$CI_COMMIT_SHA (merge result commit $CI_COMMIT_SHA) so we can use $CI_MERGE_REQUEST_DIFF_BASE_SHA for undercoverage in this merged result pipeline";
-        git checkout -f ${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA};
-        bundle_install_script;
+    - if [ -n "$CI_MERGE_REQUEST_TARGET_BRANCH_SHA" ]; then
+        echo "HEAD is $(git rev-parse HEAD). \$CI_MERGE_REQUEST_TARGET_BRANCH_SHA is ${CI_MERGE_REQUEST_TARGET_BRANCH_SHA}";
       else
-        echo "Using \$CI_COMMIT_SHA ($CI_COMMIT_SHA) for this non-merge result pipeline.";
+        echo "HEAD is $(git rev-parse HEAD). \$CI_MERGE_REQUEST_DIFF_BASE_SHA is ${CI_MERGE_REQUEST_DIFF_BASE_SHA}";
       fi;
-    - UNDERCOVERAGE_COMPARE="${CI_MERGE_REQUEST_DIFF_BASE_SHA:-$(git merge-base origin/master HEAD)}"
-    - echo "Undercoverage comparing with ${UNDERCOVERAGE_COMPARE}"
+    - UNDERCOVERAGE_COMPARE="${CI_MERGE_REQUEST_TARGET_BRANCH_SHA:-$CI_MERGE_REQUEST_DIFF_BASE_SHA}"
+    - git diff ${UNDERCOVERAGE_COMPARE} --stat
+    - echo "Undercoverage comparing with ${UNDERCOVERAGE_COMPARE}."
     - if [ -f scripts/undercoverage ]; then
-        run_timed_command "scripts/undercoverage ${UNDERCOVERAGE_COMPARE}";
+        run_timed_command "bundle exec scripts/undercoverage ${UNDERCOVERAGE_COMPARE}";
       fi;
 
 rspec:feature-flags:

.gitlab/ci/rules.gitlab-ci.yml

@@ -127,6 +127,9 @@
 .if-dot-com-gitlab-org-and-security-merge-request: &if-dot-com-gitlab-org-and-security-merge-request
   if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/security$)/ && $CI_MERGE_REQUEST_IID'
 
+.if-dot-com-gitlab-org-and-security-merge-request-and-qa-tests-specified: &if-dot-com-gitlab-org-and-security-merge-request-and-qa-tests-specified
+  if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/security$)/ && $CI_MERGE_REQUEST_IID && $QA_TESTS'
+
 .if-dot-com-gitlab-org-and-security-merge-request-manual-ff-package-and-qa: &if-dot-com-gitlab-org-and-security-merge-request-manual-ff-package-and-qa
   if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/security$)/ && $CI_MERGE_REQUEST_IID && $QA_MANUAL_FF_PACKAGE_AND_QA'
 
@@ -943,6 +946,9 @@
     - <<: *if-dot-com-gitlab-org-and-security-merge-request
       changes: *qa-patterns
       allow_failure: true
+    - <<: *if-dot-com-gitlab-org-and-security-merge-request-and-qa-tests-specified
+      changes: *code-patterns
+      allow_failure: true
     - <<: *if-dot-com-gitlab-org-and-security-merge-request
       changes: *code-patterns
       when: manual

.gitlab/issue_templates/Broken Master - Flaky.md

+<!---
+This issue template is for a master pipeline is failing for a flaky reason that cannot be reliably reproduced.
+
+Please read the below documentations for a workflow of triaging and resolving broken master.
+
+- https://about.gitlab.com/handbook/engineering/workflow/#triage-broken-master
+- https://gitlab.com/gitlab-org/quality/engineering-productivity/team/-/blob/main/runbooks/master-broken.md
+- https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/testing_guide/flaky_tests.md
+--->
+
+### Summary
+
+<!-- Link to the failing master build and add the build failure output in the below code block section. -->
+
+### Steps to reproduce
+
+<!-- If the pipeline failure is reproducible, provide steps to recreate the issue locally. Please use an ordered list. -->
+
+### Proposed Resolution
+
+<!-- Describe the proposed change to restore master stability. -->
+
+Please refer to the [Resolution guidance](https://about.gitlab.com/handbook/engineering/workflow/#resolution-of-broken-master) to learn more about resolution of broken master.
+
+/label ~"failure::flaky-test" ~"Engineering Productivity" ~"priority::2" ~"severity::2"

.gitlab/issue_templates/Broken Master - Non-flaky.md

+<!---
+This issue template is for a master pipeline is failing for a non-flaky reason.
+
+Please read the below documentations for a workflow of triaging and resolving broken master.
+
+- https://about.gitlab.com/handbook/engineering/workflow/#triage-broken-master
+- https://gitlab.com/gitlab-org/quality/engineering-productivity/team/-/blob/main/runbooks/master-broken.md
+--->
+
+### Summary
+
+<!-- Link to the failing master build and add the build failure output in the below code block section. -->
+
+### Steps to reproduce
+
+<!-- If the pipeline failure is reproducible, provide steps to recreate the issue locally. Please use an ordered list. -->
+
+### Proposed Resolution
+
+<!-- Describe the proposed change to restore master stability. -->
+
+Please refer to the [Resolution guidance](https://about.gitlab.com/handbook/engineering/workflow/#resolution-of-broken-master) to learn more about resolution of broken master.
+
+/label ~"master:broken" ~"Engineering Productivity" ~"priority::1" ~"severity::1"

.gitlab/issue_templates/Feature Flag Roll Out.md

@@ -62,7 +62,7 @@ _Consider adding links to check for Sentry errors, Production logs for 5xx, 302s
 - Ensure that the feature MRs have been deployed to non-production environments.
     - [ ] `/chatops run auto_deploy status <merge-commit-of-your-feature>`
 - [ ] Enable the feature globally on non-production environments.
-    - [ ] `/chatops run feature set <feature-flag-name> true --dev --staging`
+    - [ ] `/chatops run feature set <feature-flag-name> true --dev --staging --staging-ref`
 - [ ] Verify that the feature works as expected. Posting the QA result in this issue is preferable.
       The best environment to validate the feature in is [staging-canary](https://about.gitlab.com/handbook/engineering/infrastructure/environments/#staging-canary)
       as this is the first environment deployed to. Note you will need to make sure you are configured to use canary as outlined [here](https://about.gitlab.com/handbook/engineering/infrastructure/environments/canary-stage/)
@@ -120,7 +120,7 @@ To do so, follow these steps:
       the feature can be officially announced in a release blog post.
     - [ ] `/chatops run release check <merge-request-url> <milestone>`
 - [ ] Consider cleaning up the feature flag from all environments by running these chatops command in `#production` channel. Otherwise these settings may override the default enabled.
-    - [ ] `/chatops run feature delete <feature-flag-name> --dev --staging --production`
+    - [ ] `/chatops run feature delete <feature-flag-name> --dev --staging --staging-ref --production`
 - [ ] Close [the feature issue](ISSUE LINK) to indicate the feature will be released in the current milestone.
 - [ ] Set the next milestone to this rollout issue for scheduling [the flag removal](#release-the-feature).
 - [ ] (Optional) You can [create a separate issue](https://gitlab.com/gitlab-org/gitlab/-/issues/new?issuable_template=Feature%20Flag%20Cleanup) for scheduling the steps below to [Release the feature](#release-the-feature).
@@ -156,7 +156,7 @@ You can either [create a follow-up issue for Feature Flag Cleanup](https://gitla
     - [ ] `/chatops run release check <merge-request-url> <milestone>`
 - [ ] Close [the feature issue](ISSUE LINK) to indicate the feature will be released in the current milestone.
 - [ ] If not already done, clean up the feature flag from all environments by running these chatops command in `#production` channel:
-    - [ ] `/chatops run feature delete <feature-flag-name> --dev --staging --production`
+    - [ ] `/chatops run feature delete <feature-flag-name> --dev --staging --staging-ref --production`
 - [ ] Close this rollout issue.
 
 ## Rollback Steps

.gitpod.yml

@@ -3,7 +3,9 @@ image: registry.gitlab.com/gitlab-org/gitlab-development-kit/gitpod-workspace:st
 tasks:
 
   - name: GDK
-    command: gp sync-await gdk-copied && cd /workspace/gitlab-development-kit && gdk help
+    command: |
+      echo START_TIME_IN_SECONDS="$(date +%s)" | tee /workspace/gitpod_start_time.sh
+      gp sync-await gdk-copied && cd /workspace/gitlab-development-kit && gdk help
 
   - init: |
       echo "$(date) – Copying GDK" | tee -a /workspace/startup.log
@@ -35,6 +37,7 @@ tasks:
       (
         set -e
         gp sync-done gdk-copied
+        source /workspace/gitpod_start_time.sh
         SECONDS=0
         cd /workspace/gitlab-development-kit
         # update GDK
@@ -80,6 +83,8 @@ tasks:
         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
+        PREBUILD_LOG=(/workspace/.gitpod/prebuild-log-*)
+        printf "Took %.1f minutes from https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitpod.yml being executed through to completion %s\n" "$((10*(($(date +%s)-${START_TIME_IN_SECONDS}))/60))e-1" "$([[ -f "$PREBUILD_LOG" ]] && echo "With Prebuilds")"    
       )
 
 ports:

.rubocop_todo/gitlab/namespaced_class.yml

@@ -285,7 +285,6 @@ Gitlab/NamespacedClass:
     - 'app/models/project_snippet.rb'
     - 'app/models/project_statistics.rb'
     - 'app/models/project_team.rb'
-    - 'app/models/project_tracing_setting.rb'
     - 'app/models/project_wiki.rb'
     - 'app/models/prometheus_alert.rb'
     - 'app/models/prometheus_alert_event.rb'

.rubocop_todo/layout/line_length.yml

@@ -2825,7 +2825,6 @@ Layout/LineLength:
     - 'ee/spec/services/ee/boards/issues/list_service_spec.rb'
     - 'ee/spec/services/ee/boards/lists/max_limits_spec.rb'
     - 'ee/spec/services/ee/ci/pipeline_processing/atomic_processing_service_spec.rb'
-    - 'ee/spec/services/ee/commits/create_service_spec.rb'
     - 'ee/spec/services/ee/git/wiki_push_service_spec.rb'
     - 'ee/spec/services/ee/groups/autocomplete_service_spec.rb'
     - 'ee/spec/services/ee/groups/deploy_tokens/create_service_spec.rb'
@@ -6547,7 +6546,6 @@ Layout/LineLength:
     - 'spec/workers/users/deactivate_dormant_users_worker_spec.rb'
     - 'spec/workers/web_hooks/destroy_worker_spec.rb'
     - 'tooling/bin/find_changes'
-    - 'tooling/bin/qa/check_if_qa_only_spec_changes'
     - 'tooling/danger/product_intelligence.rb'
     - 'tooling/danger/project_helper.rb'
     - 'tooling/danger/specs.rb'

.rubocop_todo/style/if_unless_modifier.yml

@@ -1251,7 +1251,6 @@ Style/IfUnlessModifier:
     - 'spec/views/projects/edit.html.haml_spec.rb'
     - 'spec/views/shared/access_tokens/_table.html.haml_spec.rb'
     - 'spec/workers/analytics/usage_trends/counter_job_worker_spec.rb'
-    - 'tooling/bin/qa/check_if_qa_only_spec_changes'
     - 'tooling/danger/product_intelligence.rb'
     - 'tooling/lib/tooling/image.rb'
     - 'tooling/lib/tooling/test_map_packer.rb'

.rubocop_todo/style/redundant_regexp_escape.yml

@@ -109,5 +109,4 @@ Style/RedundantRegexpEscape:
     - 'spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb'
     - 'spec/uploaders/personal_file_uploader_spec.rb'
     - 'spec/views/help/index.html.haml_spec.rb'
-    - 'tooling/bin/qa/check_if_qa_only_spec_changes'
     - 'tooling/danger/project_helper.rb'

Gemfile

@@ -255,7 +255,7 @@ gem 'slack-messenger', '~> 2.3.4'
 gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat'
 
 # Asana integration
-gem 'asana', '~> 0.10.3'
+gem 'asana', '~> 0.10.13'
 
 # FogBugz integration
 gem 'ruby-fogbugz', '~> 0.2.1'
@@ -407,7 +407,7 @@ group :development, :test do
 end
 
 group :development, :test, :danger do
-  gem 'gitlab-dangerfiles', '~> 3.3.0', require: false
+  gem 'gitlab-dangerfiles', '~> 3.4.1', require: false
 end
 
 group :development, :test, :coverage do
@@ -436,7 +436,7 @@ group :test do
   gem 'capybara-screenshot', '~> 1.0.22'
   gem 'selenium-webdriver', '~> 3.142'
 
-  gem 'shoulda-matchers', '~> 4.0.1', require: false
+  gem 'shoulda-matchers', '~> 5.1.0', require: false
   gem 'email_spec', '~> 2.2.0'
   gem 'webmock', '~> 3.9.1'
   gem 'rails-controller-testing'

Gemfile.lock

@@ -83,11 +83,11 @@ GEM
     apollo_upload_server (2.1.0)
       actionpack (>= 4.2)
       graphql (>= 1.8)
-    asana (0.10.3)
+    asana (0.10.13)
       faraday (~> 1.0)
       faraday_middleware (~> 1.0)
       faraday_middleware-multi_json (~> 0.0)
-      oauth2 (~> 1.4)
+      oauth2 (>= 1.4, < 3)
     asciidoctor (2.0.15)
     asciidoctor-include-ext (0.4.0)
       asciidoctor (>= 1.5.6, < 3.0.0)
@@ -475,7 +475,7 @@ GEM
       terminal-table (~> 1.5, >= 1.5.1)
     gitlab-chronic (0.10.5)
       numerizer (~> 0.2)
-    gitlab-dangerfiles (3.3.0)
+    gitlab-dangerfiles (3.4.1)
       danger (>= 8.4.5)
       danger-gitlab (>= 8.0.0)
       rake
@@ -1225,8 +1225,8 @@ GEM
     settingslogic (2.0.9)
     sexp_processor (4.15.1)
     shellany (0.0.1)
-    shoulda-matchers (4.0.1)
-      activesupport (>= 4.2.0)
+    shoulda-matchers (5.1.0)
+      activesupport (>= 5.2.0)
     sidekiq (6.4.0)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
@@ -1454,7 +1454,7 @@ DEPENDENCIES
   addressable (~> 2.8)
   akismet (~> 3.0)
   apollo_upload_server (~> 2.1.0)
-  asana (~> 0.10.3)
+  asana (~> 0.10.13)
   asciidoctor (~> 2.0.10)
   asciidoctor-include-ext (~> 0.4.0)
   asciidoctor-kroki (~> 0.5.0)
@@ -1534,7 +1534,7 @@ DEPENDENCIES
   gitaly (~> 15.1.0.pre.rc1)
   github-markup (~> 1.7.0)
   gitlab-chronic (~> 0.10.5)
-  gitlab-dangerfiles (~> 3.3.0)
+  gitlab-dangerfiles (~> 3.4.1)
   gitlab-experiment (~> 0.7.1)
   gitlab-fog-azure-rm (~> 1.3.0)
   gitlab-labkit (~> 0.23.0)
@@ -1690,7 +1690,7 @@ DEPENDENCIES
   sentry-ruby (~> 5.1.1)
   sentry-sidekiq (~> 5.1.1)
   settingslogic (~> 2.0.9)
-  shoulda-matchers (~> 4.0.1)
+  shoulda-matchers (~> 5.1.0)
   sidekiq (~> 6.4)
   sidekiq-cron (~> 1.2)
   sigdump (~> 0.2.4)

app/assets/javascripts/access_tokens/components/access_token_table_app.vue

@@ -138,10 +138,9 @@ export default {
           }}</span>
         </template>
 
-        <template #cell(action)="{ item: { revokePath, expiresAt } }">
+        <template #cell(action)="{ item: { revokePath } }">
           <gl-button
-            variant="danger"
-            :category="expiresAt ? 'primary' : 'secondary'"
+            category="tertiary"
             :aria-label="$options.i18n.revokeButton"
             :data-confirm="modalMessage"
             data-confirm-btn-variant="danger"

app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_trigger.vue

@@ -41,7 +41,7 @@ export default {
         'gl-mt-5': !commitsEmpty && contextCommitsEmpty,
       },
     ]"
-    :variant="commitsEmpty ? 'info' : 'default'"
+    :variant="commitsEmpty ? 'confirm' : 'default'"
     @click="openModal"
   >
     {{ buttonText }}

app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue

@@ -244,7 +244,7 @@ export default {
             </template>
           </gl-sprintf>
         </template>
-        <div class="mt-2">
+        <div class="gl-mt-3">
           <gl-search-box-by-type
             ref="searchInput"
             :placeholder="__(`Search by commit title or SHA`)"

app/assets/javascripts/batch_comments/components/draft_note.vue

 <script>
 import { GlButton, GlSafeHtmlDirective, GlBadge } from '@gitlab/ui';
 import { mapActions, mapGetters, mapState } from 'vuex';
+import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import NoteableNote from '~/notes/components/noteable_note.vue';
 import PublishButton from './publish_button.vue';
 
@@ -14,6 +15,7 @@ export default {
   directives: {
     SafeHtml: GlSafeHtmlDirective,
   },
+  mixins: [glFeatureFlagMixin()],
   props: {
     draft: {
       type: Object,
@@ -92,6 +94,7 @@ export default {
         :note="draft"
         :line="line"
         :discussion-root="true"
+        :class="{ 'gl-mb-0!': glFeatures.mrReviewSubmitComment }"
         class="draft-note"
         @handleEdit="handleEditing"
         @cancelForm="handleNotEditing"
@@ -113,7 +116,11 @@ export default {
         class="referenced-commands draft-note-commands"
       ></div>
 
-      <p class="draft-note-actions d-flex" data-qa-selector="draft_note_content">
+      <p
+        v-if="!glFeatures.mrReviewSubmitComment"
+        class="draft-note-actions d-flex"
+        data-qa-selector="draft_note_content"
+      >
         <publish-button
           :show-count="true"
           :should-publish="false"

app/assets/javascripts/batch_comments/components/preview_dropdown.vue

@@ -63,7 +63,6 @@ export default {
       data-testid="preview-item"
       @click="onClickDraft(draft)"
     >
-      {{ isOnLatestDiff(draft) }}
       <preview-item :draft="draft" :is-last="isLast(index)" />
     </gl-dropdown-item>
   </gl-dropdown>

app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js

@@ -138,6 +138,12 @@ export const scrollToDraft = ({ dispatch, rootGetters }, draft) => {
     window.mrTabs.tabShown(tab);
   }
 
+  const { file_path: filePath } = draft;
+
+  if (filePath) {
+    dispatch('diffs/setFileCollapsedAutomatically', { filePath, collapsed: false }, { root: true });
+  }
+
   if (discussion) {
     dispatch('expandDiscussion', { discussionId: discussion.id }, { root: true });
   }

app/assets/javascripts/diffs/components/diff_line_note_form.vue

@@ -206,6 +206,7 @@ export default {
       );
     },
     updateStartLine(line) {
+      this.commentLineStart = line;
       this.lines.start = line;
     },
   },
@@ -216,7 +217,6 @@ export default {
   <div class="content discussion-form discussion-form-container discussion-notes">
     <div class="gl-mb-3 gl-text-gray-500 gl-pb-3">
       <multiline-comment-form
-        v-model="commentLineStart"
         :line="line"
         :line-range="lines"
         :comment-line-options="commentLineOptions"