Add latest changes from gitlab-org/gitlab@master

PROCESS.md

@@ -11,15 +11,6 @@
   - [Merge request coaching](#merge-request-coaching)
 - [Assigning issues](#assigning-issues)
 - [Be kind](#be-kind)
-- [Feature freeze on the 7th for the release on the 22nd](#feature-freeze-on-the-7th-for-the-release-on-the-22nd)
-  - [Feature flags](#feature-flags)
-  - [Between the 1st and the 7th](#between-the-1st-and-the-7th)
-    - [What happens if these deadlines are missed?](#what-happens-if-these-deadlines-are-missed)
-  - [On the 7th](#on-the-7th)
-    - [Feature merge requests](#feature-merge-requests)
-    - [Documentation merge requests](#documentation-merge-requests)
-  - [After the 7th](#after-the-7th)
-  - [Asking for an exception](#asking-for-an-exception)
 - [Bugs](#bugs)
   - [Regressions](#regressions)
   - [Managing bugs](#managing-bugs)
@@ -100,135 +91,6 @@ Product Managers must have their proposal for that milestone ready by the 22nd o
 This proposal will be shared with Engineering for discussion, feedback, and planning.
 The plan for the upcoming milestone must be finalized by the 1st of the month, one week before kickoff on the 8th.
-## Feature freeze on the 7th for the release on the 22nd
-
-The feature freeze on the 7th has been discontinued. [Transition period overview](https://gitlab.com/gitlab-org/release/docs/blob/21cbd409dd5f157fe252f254f3e897f01908abe2/general/deploy/auto-deploy-transition.md#transition)
-describes the change to this process. During the transition period, the only guarantee that
-a change will be included in the release on the 22nd is if the change has been
-deployed to GitLab.com prior to this date.
-
-### Between the 1st and the 7th
-
-These types of merge requests for the upcoming release need special consideration:
-
-* **Large features**: a large feature is one that is highlighted in the kick-off
-  and the release blogpost; typically this will have its own channel in Slack
-  and a dedicated team with front-end, back-end, and UX.
-* **Small features**: any other feature request.
-
-It is strongly recommended that **large features** be with a maintainer **by the
-1st**. This means that:
-
-* There is a merge request (even if it's WIP).
-* The person (or people, if it needs a frontend and backend maintainer) who will
-  ultimately be responsible for merging this have been pinged on the MR.
-
-It's OK if merge request isn't completely done, but this allows the maintainer
-enough time to make the decision about whether this can make it in before the
-freeze. If the maintainer doesn't think it will make it, they should inform the
-developers working on it and the Product Manager responsible for the feature.
-
-The maintainer can also choose to assign a reviewer to perform an initial
-review, but this way the maintainer is unlikely to be surprised by receiving an
-MR later in the cycle.
-
-It is strongly recommended that **small features** be with a reviewer (not
-necessarily a maintainer) **by the 3rd**.
-
-Most merge requests from the community do not have a specific release
-target. However, if one does and falls into either of the above categories, it's
-the reviewer's responsibility to manage the above communication and assignment
-on behalf of the community member.
-
-Every new feature or change should be shipped with its corresponding documentation
-in accordance with the
-[documentation process](https://docs.gitlab.com/ee/development/documentation/feature-change-workflow.html)
-and [structure](https://docs.gitlab.com/ee/development/documentation/structure.html) guides.
-Note that a technical writer will review all changes to documentation. This can occur
-in the same MR as the feature code, but [if there is not sufficient time or need,
-it can be planned via a follow-up issue for doc review](https://docs.gitlab.com/ee/development/documentation/feature-change-workflow.html#1-product-managers-role),
-and another MR, if needed. Regardless, complete docs must be merged with code by the freeze.
-
-#### What happens if these deadlines are missed?
-
-If a small or large feature is _not_ with a maintainer or reviewer by the
-recommended date, this does _not_ mean that maintainers or reviewers will refuse
-to review or merge it, or that the feature will definitely not make it in before
-the feature freeze.
-
-However, with every day that passes without review, it will become more likely
-that the feature will slip, because maintainers and reviewers may not have
-enough time to do a thorough review, and developers may not have enough time to
-adequately address any feedback that may come back.
-
-A maintainer or reviewer may also determine that it will not be possible to
-finish the current scope of the feature in time, but that it is possible to
-reduce the scope so that something can still ship this month, with the remaining
-scope moving to the next release. The sooner this decision is made, in
-conversation with the Product Manager and developer, the more time there is to
-extract that which is now out of scope, and to finish that which remains in scope.
-
-For these reasons, it is strongly recommended to follow the guidelines above,
-to maximize the chances of your feature making it in before the feature freeze,
-and to prevent any last minute surprises.
-
-### On the 7th
-
-Merge requests should still be complete, following the [definition of done][done].
-
-If a merge request is not ready, but the developers and Product Manager
-responsible for the feature think it is essential that it is in the release,
-they can [ask for an exception](#asking-for-an-exception) in advance. This is
-preferable to merging something that we are not confident in, but should still
-be a rare case: most features can be allowed to slip a release.
-
-All Community Edition merge requests from GitLab team members merged on the
-freeze date (the 7th) should have a corresponding Enterprise Edition merge
-request, even if there are no conflicts. This is to reduce the size of the
-subsequent EE merge, as we often merge a lot to CE on the release date. For more
-information, see
-[Automatic CE->EE merge][automatic_ce_ee_merge] and
-[Guidelines for implementing Enterprise Edition features][ee_features].
-
-### After the 7th
-
-Once the stable branch is frozen, the only MRs that can be cherry-picked into
-the stable branch are:
-
-* Fixes for [regressions](#regressions) where the affected version `xx.x` in `regression:xx.x` is the current release. See [Managing bugs](#managing-bugs) section.
-* Fixes for security issues.
-* Fixes or improvements to automated QA scenarios.
-* [Documentation improvements](https://docs.gitlab.com/ee/development/documentation/workflow.html) for feature changes made in the same release, though initial docs for these features should have already been merged by the freeze, as required.
-* New or updated translations (as long as they do not touch application code).
-* Changes that are behind a feature flag and have the ~"feature flag" label.
-
-During the feature freeze all merge requests that are meant to go into the
-upcoming release should have the correct milestone assigned _and_ the
-`Pick into X.Y` label where `X.Y` is equal to the milestone, so that release
-managers can find and pick them.
-Merge requests without this label will not be picked into the stable release.
-
-For example, if the upcoming release is `10.2.0` you will need to set the
-`Pick into 10.2` label.
-
-Fixes marked like this will be shipped in the next RC (before the 22nd), or the
-next patch release.
-
-If a merge request is to be picked into more than one release it will need one
-`Pick into X.Y` label per release where the merge request should be back-ported
-to. For example:
-
-- `Pick into 10.1`
-- `Pick into 10.0`
-- `Pick into 9.5`
-
-### Asking for an exception
-
-If you think a merge request should go into an RC or patch even though it does not meet these requirements,
-you can ask for an exception to be made.
-
-Check [this guide](https://gitlab.com/gitlab-org/release/docs/blob/master/general/exception-request/process.md) about how to open an exception request before opening one.
-
 ## Bugs
 A ~bug is a defect, error, failure which causes the system to behave incorrectly or prevents it from fulfilling the product requirements.
@@ -256,13 +118,6 @@ Regressions should be considered high priority issues that should be solved as s
 ### Managing bugs
 **Prioritization:** We give higher priority to regressions on features that worked in the last recent monthly release and the current release candidates.
-The two scenarios below can [bypass the exception request in the release process](https://gitlab.com/gitlab-org/release/docs/blob/master/general/exception-request/process.md#after-the-7th), where the affected regression version matches the current monthly release version.
-* A regression which worked in the **Last monthly release**
-   * **Example:** In 11.0 we released a new `feature X` that is verified as working. Then in release 11.1 the feature no longer works, this is regression for 11.1. The issue should have the `regression:11.1` label.
-   * *Note:* When we say `the last recent monthly release`, this can refer to either the version currently running on GitLab.com, or the most recent version available in the package repositories.
-* A regression which worked in the **Current release candidates**
-   * **Example:** In 11.1-RC3 we shipped a new feature which has been verified as working. Then in 11.1-RC5 the feature no longer works, this is regression for 11.1. The issue should have the `regression:11.1` label.
-   * *Note:* Because GitLab.com runs release candidates of new releases, a regression can be reported in a release before its 'official' release date on the 22nd of the month.
 When a bug is found:
 1. Create an issue describing the problem in the most detailed way possible.

app/assets/javascripts/registry/components/collapsible_container.vue

@@ -85,6 +85,8 @@ export default {
           v-gl-modal="modalId"
           :title="s__('ContainerRegistry|Remove repository')"
           :aria-label="s__('ContainerRegistry|Remove repository')"
+          data-track-event="click_button"
+          data-track-label="registry_repository_delete"
           class="js-remove-repo btn-inverted"
           variant="danger"
         >

app/assets/javascripts/registry/components/table_registry.vue

@@ -192,6 +192,8 @@ export default {
               v-gl-modal="modalId"
               :disabled="!itemsToBeDeleted || itemsToBeDeleted.length === 0"
               class="js-delete-registry float-right"
+              data-track-event="click_button"
+              data-track-label="bulk_registry_tag_delete"
               variant="danger"
               :title="s__('ContainerRegistry|Remove selected tags')"
               :aria-label="s__('ContainerRegistry|Remove selected tags')"
@@ -246,6 +248,8 @@ export default {
               v-gl-modal="modalId"
               :title="s__('ContainerRegistry|Remove tag')"
               :aria-label="s__('ContainerRegistry|Remove tag')"
+              data-track-event="click_button"
+              data-track-label="registry_tag_delete"
               variant="danger"
               class="js-delete-registry-row float-right btn-inverted btn-border-color btn-icon"
               @click="deleteSingleItem(index)"

app/controllers/projects/pipelines_controller.rb

 # frozen_string_literal: true
 class Projects::PipelinesController < Projects::ApplicationController
+  include ::Gitlab::Utils::StrongMemoize
+
   before_action :whitelist_query_limiting, only: [:create, :retry]
   before_action :pipeline, except: [:index, :new, :create, :charts]
   before_action :set_pipeline_path, only: [:show]
@@ -151,6 +153,19 @@ class Projects::PipelinesController < Projects::ApplicationController
     @counts[:failed] = @project.all_pipelines.failed.count(:all)
   end
+  def test_report
+    return unless Feature.enabled?(:junit_pipeline_view, project)
+
+    if pipeline_test_report == :error
+      render json: { status: :error_parsing_report }
+      return
+    end
+
+    render json: TestReportSerializer
+      .new(current_user: @current_user)
+      .represent(pipeline_test_report)
+  end
+
   private
   def serialize_pipelines
@@ -217,6 +232,14 @@ class Projects::PipelinesController < Projects::ApplicationController
     view_context.limited_counter_with_delimiter(finder.execute)
   end
+
+  def pipeline_test_report
+    strong_memoize(:pipeline_test_report) do
+      @pipeline.test_reports
+    rescue Gitlab::Ci::Parsers::ParserError
+      :error
+    end
+  end
 end
 Projects::PipelinesController.prepend_if_ee('EE::Projects::PipelinesController')

app/controllers/projects/registry/repositories_controller.rb

@@ -8,6 +8,7 @@ module Projects
       def index
         @images = project.container_repositories
+        track_event(:list_repositories)
         respond_to do |format|
           format.html
@@ -21,6 +22,7 @@ module Projects
       def destroy
         DeleteContainerRepositoryWorker.perform_async(current_user.id, image.id)
+        track_event(:delete_repository)
         respond_to do |format|
           format.json { head :no_content }

app/controllers/projects/registry/tags_controller.rb

@@ -8,6 +8,7 @@ module Projects
       LIMIT = 15
       def index
+        track_event(:list_tags)
         respond_to do |format|
           format.json do
             render json: ContainerTagsSerializer
@@ -22,6 +23,7 @@ module Projects
         result = Projects::ContainerRepository::DeleteTagsService
           .new(image.project, current_user, tags: [params[:id]])
           .execute(image)
+        track_event(:delete_tag)
         respond_to do |format|
           format.json { head(result[:status] == :success ? :ok : bad_request) }
@@ -43,6 +45,7 @@ module Projects
         result = Projects::ContainerRepository::DeleteTagsService
           .new(image.project, current_user, tags: tag_names)
           .execute(image)
+        track_event(:delete_tag_bulk)
         respond_to do |format|
           format.json { head(result[:status] == :success ? :no_content : :bad_request) }

app/models/ci/pipeline.rb

@@ -746,6 +746,10 @@ module Ci
         end
     end
+    def all_merge_requests_by_recency
+      all_merge_requests.order(id: :desc)
+    end
+
     def detailed_status(current_user)
       Gitlab::Ci::Status::Pipeline::Factory
         .new(self, current_user)

app/models/clusters/applications/prometheus.rb

@@ -112,7 +112,12 @@ module Clusters
       def delete_knative_istio_metrics
         return [] unless cluster.application_knative_available?
-        [Gitlab::Kubernetes::KubectlCmd.delete("-f", Clusters::Applications::Knative::METRICS_CONFIG)]
+        [
+          Gitlab::Kubernetes::KubectlCmd.delete(
+            "-f", Clusters::Applications::Knative::METRICS_CONFIG,
+            "--ignore-not-found"
+          )
+        ]
       end
     end
   end

app/models/concerns/relative_positioning.rb

@@ -127,6 +127,7 @@ module RelativePositioning
     if pos_after && (pos_after - pos_before) < 2
       before.move_sequence_after
+      pos_after = before.next_relative_position
     end
     self.relative_position = self.class.position_between(pos_before, pos_after)
@@ -138,6 +139,7 @@ module RelativePositioning
     if pos_before && (pos_after - pos_before) < 2
       after.move_sequence_before
+      pos_before = after.prev_relative_position
     end
     self.relative_position = self.class.position_between(pos_before, pos_after)

app/presenters/ci/pipeline_presenter.rb

@@ -48,15 +48,35 @@ module Ci
     def ref_text
       if pipeline.detached_merge_request_pipeline?
-        _("for %{link_to_merge_request} with %{link_to_merge_request_source_branch}").html_safe % { link_to_merge_request: link_to_merge_request, link_to_merge_request_source_branch: link_to_merge_request_source_branch }
+        _("for %{link_to_merge_request} with %{link_to_merge_request_source_branch}")
+          .html_safe % {
+            link_to_merge_request: link_to_merge_request,
+            link_to_merge_request_source_branch: link_to_merge_request_source_branch
+          }
       elsif pipeline.merge_request_pipeline?
-        _("for %{link_to_merge_request} with %{link_to_merge_request_source_branch} into %{link_to_merge_request_target_branch}").html_safe % { link_to_merge_request: link_to_merge_request, link_to_merge_request_source_branch: link_to_merge_request_source_branch, link_to_merge_request_target_branch: link_to_merge_request_target_branch }
+        _("for %{link_to_merge_request} with %{link_to_merge_request_source_branch} into %{link_to_merge_request_target_branch}")
+          .html_safe % {
+            link_to_merge_request: link_to_merge_request,
+            link_to_merge_request_source_branch: link_to_merge_request_source_branch,
+            link_to_merge_request_target_branch: link_to_merge_request_target_branch
+          }
+      elsif pipeline.ref && pipeline.ref_exists?
+        _("for %{link_to_pipeline_ref}")
+        .html_safe % { link_to_pipeline_ref: link_to_pipeline_ref }
       elsif pipeline.ref
-        if pipeline.ref_exists?
-          _("for %{link_to_pipeline_ref}").html_safe % { link_to_pipeline_ref: link_to_pipeline_ref }
-        else
-          _("for %{ref}").html_safe % { ref: content_tag(:span, pipeline.ref, class: 'ref-name') }
-        end
+        _("for %{ref}").html_safe % { ref: plain_ref_name }
+      end
+    end
+
+    def all_related_merge_request_text
+      if all_related_merge_requests.none?
+        'No related merge requests found.'
+      else
+        _("%{count} related %{pluralized_subject}: %{links}" % {
+          count: all_related_merge_requests.count,
+          pluralized_subject: 'merge request'.pluralize(all_related_merge_requests.count),
+          links: all_related_merge_request_links.join(', ')
+        }).html_safe
       end
     end
@@ -84,10 +104,30 @@ module Ci
     private
+    def plain_ref_name
+      content_tag(:span, pipeline.ref, class: 'ref-name')
+    end
+
     def merge_request_presenter
-      return unless pipeline.triggered_by_merge_request?
-      @merge_request_presenter ||= pipeline.merge_request.present(current_user: current_user)
+      strong_memoize(:merge_request_presenter) do
+        if pipeline.triggered_by_merge_request?
+          pipeline.merge_request.present(current_user: current_user)
+        end
+      end
+    end
+    def all_related_merge_request_links
+      all_related_merge_requests.map do |merge_request|
+        mr_path = project_merge_request_path(merge_request.project, merge_request)
+
+        link_to "#{merge_request.to_reference} #{merge_request.title}", mr_path, class: 'mr-iid'
+      end
+    end
+
+    def all_related_merge_requests
+      strong_memoize(:all_related_merge_requests) do
+        pipeline.ref ? pipeline.all_merge_requests_by_recency.to_a : []
+      end
     end
   end
 end

app/serializers/test_report_entity.rb

+# frozen_string_literal: true
+
+class TestReportEntity < Grape::Entity
+  expose :total_time
+  expose :total_count
+
+  expose :success_count
+  expose :failed_count
+  expose :skipped_count
+  expose :error_count
+
+  expose :test_suites, using: TestSuiteEntity do |report|
+    report.test_suites.values
+  end
+end

app/serializers/test_report_serializer.rb

+# frozen_string_literal: true
+
+class TestReportSerializer < BaseSerializer
+  entity TestReportEntity
+end

app/serializers/test_suite_entity.rb

+# frozen_string_literal: true
+
+class TestSuiteEntity < Grape::Entity
+  expose :name
+  expose :total_time
+  expose :total_count
+
+  expose :success_count
+  expose :failed_count
+  expose :skipped_count
+  expose :error_count
+
+  expose :test_cases, using: TestCaseEntity do |test_suite|
+    test_suite.test_cases.values.flat_map(&:values)
+  end
+end

changelogs/unreleased/31590-tag-delete-instrumentation.yml

+---
+title: Collect docker registry related metrics
+merge_request: 17063
+author:
+type: added

changelogs/unreleased/32839-fix-relative-position-edge-case.yml

+---
+title: Fix relative positioning when moving items down and there is no space
+merge_request: 17781
+author:
+type: fixed

changelogs/unreleased/feature-ignore-prometheus-metrics-not-present.yml

+---
+title: Avoid knative and prometheus uninstall race condition
+merge_request: 18020
+author:
+type: changed

changelogs/unreleased/mr-links-4-pipes.yml

+---
+title: Use MR links in PipelinePresenter#ref_text for branch pipelines
+merge_request: 17947
+author:
+type: changed

config/gitlab.yml.example

@@ -319,8 +319,7 @@ production: &base
     artifacts_server: true # Set to false if you want to disable online view of HTML artifacts
     # external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages
     # external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages
-    admin:
-      address: unix:/home/git/gitlab/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port)
+
     # File that contains the shared secret key for verifying access for gitlab-pages.
     # Default is '.gitlab_pages_shared_secret' relative to Rails.root (i.e. root of the GitLab app).
     # secret_file: /home/git/gitlab/.gitlab_pages_shared_secret

config/initializers/1_settings.rb

@@ -290,9 +290,6 @@ Settings.pages['url']               ||= Settings.__send__(:build_pages_url)
 Settings.pages['external_http']     ||= false unless Settings.pages['external_http'].present?
 Settings.pages['external_https']    ||= false unless Settings.pages['external_https'].present?
 Settings.pages['artifacts_server']  ||= Settings.pages['enabled'] if Settings.pages['artifacts_server'].nil?
-
-Settings.pages['admin'] ||= Settingslogic.new({})
-Settings.pages.admin['certificate'] ||= ''
 Settings.pages['secret_file'] ||= Rails.root.join('.gitlab_pages_shared_secret')
 #

config/initializers/pages.rb

-Gitlab::PagesClient.read_or_create_token
-Gitlab::PagesClient.load_certificate