Automatic merge of gitlab-org/gitlab master

app/services/ci/daily_build_group_report_result_service.rb

@@ -14,7 +14,8 @@ module Ci
         ref_path: pipeline.source_ref_path,
         date: pipeline.created_at.to_date,
         last_pipeline_id: pipeline.id,
-        default_branch: pipeline.default_branch?
+        default_branch: pipeline.default_branch?,
+        group_id: pipeline.project&.group&.id
       }
 
       aggregate(pipeline.builds.with_coverage).map do |group_name, group|

changelogs/unreleased/mo-add-group-id-to-coverage-data.yml

+---
+title: Add group_id to ci_daily_build_group_report_result
+merge_request: 53494
+author:
+type: added

db/migrate/20210204212850_add_group_id_to_ci_daily_build_group_report_results.rb

+# frozen_string_literal: true
+
+class AddGroupIdToCiDailyBuildGroupReportResults < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def change
+    add_column(:ci_daily_build_group_report_results, :group_id, :bigint)
+  end
+end

db/migrate/20210208144134_add_index_group_id_to_ci_daily_build_group_report_results.rb

+# frozen_string_literal: true
+
+class AddIndexGroupIdToCiDailyBuildGroupReportResults < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  INDEX_NAME = 'index_ci_daily_build_group_report_results_on_group_id'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index(:ci_daily_build_group_report_results, :group_id, name: INDEX_NAME)
+    add_concurrent_foreign_key(:ci_daily_build_group_report_results, :namespaces, column: :group_id)
+  end
+
+  def down
+    remove_foreign_key_if_exists(:ci_daily_build_group_report_results, column: :group_id)
+    remove_concurrent_index_by_name(:ci_daily_build_group_report_results, INDEX_NAME)
+  end
+end

db/schema_migrations/20210204212850

+2a40acf9a3ac2716120388cfe79be13130e4587286d215596e9c75097af1e436
\ No newline at end of file

db/schema_migrations/20210208144134

+845636d8a0c6e9b6b39194cb44ffeceea3464023c22fadb2a4da44fed5dd973f
\ No newline at end of file

db/structure.sql

@@ -10381,7 +10381,8 @@ CREATE TABLE ci_daily_build_group_report_results (
     ref_path text NOT NULL,
     group_name text NOT NULL,
     data jsonb NOT NULL,
-    default_branch boolean DEFAULT false NOT NULL
+    default_branch boolean DEFAULT false NOT NULL,
+    group_id bigint
 );
 
 CREATE SEQUENCE ci_daily_build_group_report_results_id_seq
@@ -21632,6 +21633,8 @@ CREATE INDEX index_ci_builds_project_id_and_status_for_live_jobs_partial2 ON ci_
 
 CREATE UNIQUE INDEX index_ci_builds_runner_session_on_build_id ON ci_builds_runner_session USING btree (build_id);
 
+CREATE INDEX index_ci_daily_build_group_report_results_on_group_id ON ci_daily_build_group_report_results USING btree (group_id);
+
 CREATE INDEX index_ci_daily_build_group_report_results_on_last_pipeline_id ON ci_daily_build_group_report_results USING btree (last_pipeline_id);
 
 CREATE INDEX index_ci_daily_build_group_report_results_on_project_and_date ON ci_daily_build_group_report_results USING btree (project_id, date DESC) WHERE ((default_branch = true) AND ((data -> 'coverage'::text) IS NOT NULL));
@@ -24727,6 +24730,9 @@ ALTER TABLE ONLY system_note_metadata
 ALTER TABLE ONLY vulnerability_remediations
     ADD CONSTRAINT fk_fc61a535a0 FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY ci_daily_build_group_report_results
+    ADD CONSTRAINT fk_fd1858fefd FOREIGN KEY (group_id) REFERENCES namespaces(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY merge_requests
     ADD CONSTRAINT fk_fd82eae0b9 FOREIGN KEY (head_pipeline_id) REFERENCES ci_pipelines(id) ON DELETE SET NULL;
 

doc/.vale/gitlab/spelling-exceptions.txt

@@ -16,6 +16,7 @@ Anthos
 approvers
 architected
 architecting
+archiver
 Arel
 Artifactory
 Asana
@@ -183,6 +184,7 @@ failsafe
 Falco
 falsy
 fastlane
+Fastzip
 favicon
 favorited
 Figma
@@ -200,6 +202,8 @@ fuzzer
 Gantt
 Gemnasium
 Gemojione
+Getter
+Getters
 gettext
 Git
 Gitaly

doc/architecture/blueprints/graphql_api/index.md

@@ -113,7 +113,7 @@ this knowledge onto GraphQL and make it performant and secure by default.
 - Design direct uploads for GraphQL
 - Build GraphQL query depth and complexity histograms
 - Visualize the amount of GraphQL queries reaching limits
-- Add support for GraphQL etags for existing features
+- Add support for GraphQL ETags for existing features
 
 ### Design GraphQL interoperability with REST API
 
@@ -138,7 +138,7 @@ state synchronization mechanisms and hooking into existing ones.
 
 - Design a scalable state synchronization mechanism
 - Evaluate state synchronization through pub/sub and websockets
-- Build a generic support for GraphQL feature correlation and feature etags
+- Build a generic support for GraphQL feature correlation and feature ETags
 - Redesign frontend code responsible for managing shared global state
 
 ## Iterations

doc/ci/runners/README.md

@@ -844,5 +844,5 @@ variables:
 | Variable                        | Description                                            |
 |---------------------------------|--------------------------------------------------------|
 | `TRANSFER_METER_FREQUENCY`      | Specify how often to print the meter's transfer rate. It can be set to a duration (for example, `1s` or `1m30s`). A duration of `0` disables the meter (default). When a value is set, the pipeline shows a progress meter for artifact and cache uploads and downloads. |
-| `ARTIFACT_COMPRESSION_LEVEL`    | To adjust compression ratio, set to `fastest`, `fast`, `default`, `slow`, or `slowest`. This setting works with the fastzip archiver only, so the GitLab Runner feature flag [`FF_USE_FASTZIP`](https://docs.gitlab.com/runner/configuration/feature-flags.html#available-feature-flags) must also be enabled. |
-| `CACHE_COMPRESSION_LEVEL`       | To adjust compression ratio, set to `fastest`, `fast`, `default`, `slow`, or `slowest`. This setting works with the fastzip archiver only, so the GitLab Runner feature flag [`FF_USE_FASTZIP`](https://docs.gitlab.com/runner/configuration/feature-flags.html#available-feature-flags) must also be enabled. |
+| `ARTIFACT_COMPRESSION_LEVEL`    | To adjust compression ratio, set to `fastest`, `fast`, `default`, `slow`, or `slowest`. This setting works with the Fastzip archiver only, so the GitLab Runner feature flag [`FF_USE_FASTZIP`](https://docs.gitlab.com/runner/configuration/feature-flags.html#available-feature-flags) must also be enabled. |
+| `CACHE_COMPRESSION_LEVEL`       | To adjust compression ratio, set to `fastest`, `fast`, `default`, `slow`, or `slowest`. This setting works with the Fastzip archiver only, so the GitLab Runner feature flag [`FF_USE_FASTZIP`](https://docs.gitlab.com/runner/configuration/feature-flags.html#available-feature-flags) must also be enabled. |

doc/development/fe_guide/design_anti_patterns.md

@@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 Anti-patterns may seem like good approaches at first, but it has been shown that they bring more ills than benefits. These should
 generally be avoided.
 
-Throughout the GitLab codebase, there may be historic uses of these anti-patterns. Please [use descretion](https://about.gitlab.com/handbook/engineering/#balance-refactoring-and-velocity)
+Throughout the GitLab codebase, there may be historic uses of these anti-patterns. Please [use discretion](https://about.gitlab.com/handbook/engineering/#balance-refactoring-and-velocity)
 when figuring out whether or not to refactor, when touching code that uses one of these legacy patterns.
 
 **Please note:** For new features, anti-patterns are not necessarily prohibited, but it is **strongly suggested** to find another approach.
@@ -174,7 +174,7 @@ export const fuzzify = (id) => { /* ... */ };
 #### Dependency Injection
 
 [Dependency Injection](https://en.wikipedia.org/wiki/Dependency_injection) is an approach which breaks
-coupling by declaring a module's dependencies to be injected from outside the module (e.g., through constructor parameters, a bon-a-fide Dependency Injection framework, and even Vue's `provide/inject`).
+coupling by declaring a module's dependencies to be injected from outside the module (e.g., through constructor parameters, a bona-fide Dependency Injection framework, and even Vue's `provide/inject`).
 
 ```javascript
 // bad - Vue component coupled to Singleton

doc/development/fe_guide/index.md

@@ -12,7 +12,10 @@ across the GitLab frontend team.
 ## Overview
 
 GitLab is built on top of [Ruby on Rails](https://rubyonrails.org). It uses [Haml](https://haml.info/) and a JavaScript0based frontend with [Vue.js](https://vuejs.org).
-Be wary of [the limitations that come with using Hamlit](https://github.com/k0kubun/hamlit/blob/master/REFERENCE.md#limitations). We also use [SCSS](https://sass-lang.com) and plain JavaScript with
+<!-- vale gitlab.Spelling = NO -->
+Be wary of [the limitations that come with using Hamlit](https://github.com/k0kubun/hamlit/blob/master/REFERENCE.md#limitations).
+<!-- vale gitlab.Spelling = YES -->
+We also use [SCSS](https://sass-lang.com) and plain JavaScript with
 modern ECMAScript standards supported through [Babel](https://babeljs.io/) and ES module support through [webpack](https://webpack.js.org/).
 
 Working with our frontend assets requires Node (v10.13.0 or greater) and Yarn

doc/development/fe_guide/performance.md

@@ -219,7 +219,7 @@ Use the following rules when creating real-time solutions.
 1. A response with HTTP status different from 2XX should disable polling as well.
 1. Use a common library for polling.
 1. Poll on active tabs only. Please use [Visibility](https://github.com/ai/visibilityjs).
-1. Use regular polling intervals, do not use backoff polling, or jitter, as the interval is
+1. Use regular polling intervals, do not use <!-- vale gitlab.Spelling = NO --> backoff polling <!-- vale gitlab.Spelling = YES --> or jitter, as the interval is
    controlled by the server.
 1. The backend code is likely to be using ETags. You do not and should not check for status
    `304 Not Modified`. The browser transforms it for you.

doc/development/fe_guide/style/javascript.md

@@ -14,7 +14,7 @@ In addition to the style guidelines set by Airbnb, we also have a few specific r
 listed below.
 
 NOTE:
-You can run eslint locally by running `yarn eslint`
+You can run ESLint locally by running `yarn eslint`
 
 ## Avoid forEach
 

doc/development/fe_guide/style/scss.md

@@ -12,7 +12,7 @@ easy to maintain, and performant for the end-user.
 
 ## Rules
 
-Our CSS is a mixture of current and legacy approaches. That means sometimes it may be difficult to follow this guide to the letter; it means you are likely to run into exceptions, where following the guide is difficult to impossible without outsized effort. In those cases, you may work with your reviewers and maintainers to identify an approach that does not fit these rules. Please endeavor to limit these cases.
+Our CSS is a mixture of current and legacy approaches. That means sometimes it may be difficult to follow this guide to the letter; it means you are likely to run into exceptions, where following the guide is difficult to impossible without major effort. In those cases, you may work with your reviewers and maintainers to identify an approach that does not fit these rules. Please endeavor to limit these cases.
 
 ### Utility Classes
 
@@ -21,10 +21,12 @@ In order to reduce the generation of more CSS as our site grows, prefer the use
 #### Where are utility classes defined?
 
 Prefer the use of [utility classes defined in GitLab UI](https://gitlab.com/gitlab-org/gitlab-ui/-/blob/main/doc/css.md#utilities).
+<!-- vale gitlab.Spelling = NO -->
 An easy list of classes can also be [seen on Unpkg](https://unpkg.com/browse/@gitlab/ui/src/scss/utilities.scss).
+<!-- vale gitlab.Spelling = YES -->
 
 Classes in [`utilities.scss`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/app/assets/stylesheets/utilities.scss) and [`common.scss`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/app/assets/stylesheets/framework/common.scss) are being deprecated.
-Classes in [`common.scss`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/app/assets/stylesheets/framework/common.scss) that use non-design system values should be avoided in favor of conformant values.
+Classes in [`common.scss`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/app/assets/stylesheets/framework/common.scss) that use non-design-system values should be avoided. Use classes with conforming values instead.
 
 Avoid [Bootstrap's Utility Classes](https://getbootstrap.com/docs/4.3/utilities/).
 
@@ -49,7 +51,7 @@ We recommend a "utility-first" approach.
 1. Start with utility classes.
 1. If composing utility classes into a component class removes code duplication and encapsulates a clear responsibility, do it.
 
-This encourages an organic growth of component classes and prevents the creation of one-off unreusable classes. Also, the kind of classes that emerge from "utility-first" tend to be design-centered (e.g. `.button`, `.alert`, `.card`) rather than domain-centered (e.g. `.security-report-widget`, `.commit-header-icon`).
+This encourages an organic growth of component classes and prevents the creation of one-off non-reusable classes. Also, the kind of classes that emerge from "utility-first" tend to be design-centered (e.g. `.button`, `.alert`, `.card`) rather than domain-centered (e.g. `.security-report-widget`, `.commit-header-icon`).
 
 Inspiration:
 

doc/development/fe_guide/vue.md

@@ -20,7 +20,7 @@ What is described in the following sections can be found in these examples:
 
 All new features built with Vue.js must follow a [Flux architecture](https://facebook.github.io/flux/).
 The main goal we are trying to achieve is to have only one data flow and only one data entry.
-In order to achieve this goal we use [vuex](#vuex).
+In order to achieve this goal we use [Vuex](#vuex).
 
 You can also read about this architecture in Vue documentation about
 [state management](https://vuejs.org/v2/guide/state-management.html#Simple-State-Management-from-Scratch)

doc/development/fe_guide/vue3_migration.md

@@ -26,7 +26,7 @@ Component's computed properties / methods or external helpers.
 
 **What to use instead**
 
-Vue documentation recommends using the [mitt](https://github.com/developit/mitt) library. It's relatively small (200 bytes gzipped) and has a clear API:
+Vue documentation recommends using the [mitt](https://github.com/developit/mitt) library. It's relatively small (200 bytes, compressed) and has a clear API:
 
 ```javascript
 import mitt from 'mitt'

doc/university/training/index.md

@@ -8,8 +8,10 @@ type: index
 
 # GitLab Training Material
 
+<!-- vale gitlab.Spelling = NO -->
 All GitLab training material is stored in Markdown format. Slides are
-generated using [Deskset](https://www.deckset.com/).
+generated using [Deckset](https://www.deckset.com/).
+<!-- vale gitlab.Spelling = YES -->
 
 All training material is open to public contribution.
 
@@ -40,6 +42,6 @@ This section contains the following topics:
 1. [GitLab Documentation](https://docs.gitlab.com)
 1. [GUI Clients](https://git-scm.com/downloads/guis)
 1. [Pro Git book](https://git-scm.com/book/en/v2)
-1. [Platzi Course](https://courses.platzi.com/courses/git-gitlab/)
+1. <!-- vale gitlab.Spelling = NO --> [Platzi Course](https://courses.platzi.com/courses/git-gitlab/) <!-- vale gitlab.Spelling = NO -->
 1. [Code School tutorial](http://try.github.io/)
 1. Contact us at `subscribers@gitlab.com`

doc/user/project/merge_requests/test_coverage_visualization.md

@@ -51,6 +51,10 @@ from any job in any stage in the pipeline. The coverage will be displayed for ea
 Hovering over the coverage bar will provide further information, such as the number
 of times the line was checked by tests.
 
+NOTE:
+A limit of 100 `<source>` nodes for Cobertura format XML files applies. If your Cobertura report exceeds
+100 nodes, there can be mismatches or no matches in the Merge Request diff view.
+
 ### Automatic class path correction
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/217664) in GitLab 13.8.

spec/services/ci/daily_build_group_report_result_service_spec.rb

@@ -7,8 +7,13 @@ RSpec.describe Ci::DailyBuildGroupReportResultService, '#execute' do
   let!(:rspec_job) { create(:ci_build, pipeline: pipeline, name: '3/3 rspec', coverage: 80) }
   let!(:karma_job) { create(:ci_build, pipeline: pipeline, name: '2/2 karma', coverage: 90) }
   let!(:extra_job) { create(:ci_build, pipeline: pipeline, name: 'extra', coverage: nil) }
+  let!(:group) { create(:group, :private) }
   let(:coverages) { Ci::DailyBuildGroupReportResult.all }
 
+  before do
+    pipeline.project.group = group
+  end
+
   it 'creates daily code coverage record for each job in the pipeline that has coverage value' do
     described_class.new.execute(pipeline)
 
@@ -19,7 +24,8 @@ RSpec.describe Ci::DailyBuildGroupReportResultService, '#execute' do
         ref_path: pipeline.source_ref_path,
         group_name: rspec_job.group_name,
         data: { 'coverage' => rspec_job.coverage },
-        date: pipeline.created_at.to_date
+        date: pipeline.created_at.to_date,
+        group_id: pipeline.project.group.id
       )
     end
 
@@ -30,7 +36,8 @@ RSpec.describe Ci::DailyBuildGroupReportResultService, '#execute' do
         ref_path: pipeline.source_ref_path,
         group_name: karma_job.group_name,
         data: { 'coverage' => karma_job.coverage },
-        date: pipeline.created_at.to_date
+        date: pipeline.created_at.to_date,
+        group_id: pipeline.project.group.id
       )
     end
 
@@ -155,6 +162,10 @@ RSpec.describe Ci::DailyBuildGroupReportResultService, '#execute' do
 
     let!(:some_job) { create(:ci_build, pipeline: new_pipeline, name: 'foo') }
 
+    before do
+      new_pipeline.project.group = group
+    end
+
     it 'does nothing' do
       expect { described_class.new.execute(new_pipeline) }.not_to raise_error
     end