Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue

@@ -122,9 +122,14 @@ export default {
     this.$store.subscribeAction({
       after: this.handleVuexActionDispatch,
     });
+
+    document.addEventListener('click', this.handleDocumentClick);
+  },
+  beforeDestroy() {
+    document.removeEventListener('click', this.handleDocumentClick);
   },
   methods: {
-    ...mapActions(['setInitialState']),
+    ...mapActions(['setInitialState', 'toggleDropdownContents']),
     /**
      * This method differentiates between
      * dispatched actions and calls necessary method.
@@ -138,6 +143,22 @@ export default {
         this.handleDropdownClose(state.labels.filter(label => label.touched));
       }
     },
+    /**
+     * This method listens for document-wide click event
+     * and toggle dropdown if user clicks anywhere outside
+     * the dropdown while dropdown is visible.
+     */
+    handleDocumentClick({ target }) {
+      if (
+        this.showDropdownButton &&
+        this.showDropdownContents &&
+        !target?.classList.contains('js-sidebar-dropdown-toggle') &&
+        !this.$refs.dropdownButtonCollapsed?.$el.contains(target) &&
+        !this.$refs.dropdownContents?.$el.contains(target)
+      ) {
+        this.toggleDropdownContents();
+      }
+    },
     handleDropdownClose(labels) {
       // Only emit label updates if there are any labels to update
       // on UI.
@@ -156,6 +177,7 @@ export default {
     <div v-if="!dropdownOnly">
       <dropdown-value-collapsed
         v-if="allowLabelCreate"
+        ref="dropdownButtonCollapsed"
         :labels="selectedLabels"
         @onValueClick="handleCollapsedValueClick"
       />
@@ -167,7 +189,7 @@ export default {
         <slot></slot>
       </dropdown-value>
       <dropdown-button v-show="showDropdownButton" />
-      <dropdown-contents v-if="showDropdownButton && showDropdownContents" />
+      <dropdown-contents v-if="showDropdownButton && showDropdownContents" ref="dropdownContents" />
     </div>
   </div>
 </template>

app/assets/stylesheets/framework/common.scss

@@ -413,6 +413,7 @@ img.emoji {
 .prepend-left-20 { margin-left: 20px; }
 .prepend-left-32 { margin-left: 32px; }
 .prepend-left-64 { margin-left: 64px; }
+.append-right-2 { margin-right: 2px; }
 .append-right-4 { margin-right: 4px; }
 .append-right-5 { margin-right: 5px; }
 .append-right-8 { margin-right: 8px; }
@@ -424,6 +425,7 @@ img.emoji {
 .append-right-48 { margin-right: 48px; }
 .prepend-right-32 { margin-right: 32px; }
 .append-bottom-0 { margin-bottom: 0; }
+.append-bottom-2 { margin-bottom: 2px; }
 .append-bottom-4 { margin-bottom: $gl-padding-4; }
 .append-bottom-5 { margin-bottom: 5px; }
 .append-bottom-8 { margin-bottom: $grid-size; }

app/controllers/dashboard/projects_controller.rb

@@ -33,7 +33,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
   # rubocop: disable CodeReuse/ActiveRecord
   def starred
     @projects = load_projects(params.merge(starred: true))
-      .includes(:forked_from_project, :tags).page(params[:page])
+      .includes(:forked_from_project, :tags)
     @groups = []
@@ -51,7 +51,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
   private
   def projects
-    @projects ||= load_projects(params.merge(non_public: true)).page(params[:page])
+    @projects ||= load_projects(params.merge(non_public: true))
   end
   def render_projects
@@ -73,6 +73,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
                 .execute
                 .includes(:route, :creator, :group, namespace: [:route, :owner])
                 .preload(:project_feature)
+                .page(finder_params[:page])
     prepare_projects_for_rendering(projects)
   end

app/models/issue.rb

@@ -67,6 +67,7 @@ class Issue < ApplicationRecord
   scope :order_due_date_desc, -> { reorder(::Gitlab::Database.nulls_last_order('due_date', 'DESC')) }
   scope :order_closest_future_date, -> { reorder(Arel.sql('CASE WHEN issues.due_date >= CURRENT_DATE THEN 0 ELSE 1 END ASC, ABS(CURRENT_DATE - issues.due_date) ASC')) }
   scope :order_relative_position_asc, -> { reorder(::Gitlab::Database.nulls_last_order('relative_position', 'ASC')) }
+  scope :order_closed_date_desc, -> { reorder(closed_at: :desc) }
   scope :preload_associated_models, -> { preload(:labels, project: :namespace) }
   scope :with_api_entity_associations, -> { preload(:timelogs, :assignees, :author, :notes, :labels, project: [:route, { namespace: :route }] ) }

app/models/service.rb

@@ -32,9 +32,12 @@ class Service < ApplicationRecord
   belongs_to :project, inverse_of: :services
   has_one :service_hook
-  validates :project_id, presence: true, unless: -> { template? }
+  validates :project_id, presence: true, unless: -> { template? || instance? }
+  validates :project_id, absence: true, if: -> { instance? }
   validates :type, presence: true
   validates :template, uniqueness: { scope: :type }, if: -> { template? }
+  validates :instance, uniqueness: { scope: :type }, if: -> { instance? }
+  validate :validate_is_instance_or_template
   scope :visible, -> { where.not(type: 'GitlabIssueTrackerService') }
   scope :issue_trackers, -> { where(category: 'issue_tracker') }
@@ -326,6 +329,10 @@ class Service < ApplicationRecord
   private
+  def validate_is_instance_or_template
+    errors.add(:template, 'The service should be a service template or instance-level integration') if template? && instance?
+  end
+
   def cache_project_has_external_issue_tracker
     if project && !project.destroyed?
       project.cache_has_external_issue_tracker

app/services/boards/issues/list_service.rb

@@ -10,6 +10,8 @@ module Boards
       end
       def execute
+        return fetch_issues.order_closed_date_desc if list&.closed?
+
         fetch_issues.order_by_position_and_priority(with_cte: can_attempt_search_optimization?)
       end

app/services/metrics/dashboard/grafana_metric_embed_service.rb

@@ -138,7 +138,9 @@ module Metrics
     end
     # Identifies the name of the datasource for a dashboard
-    # based on the panelId query parameter found in the url
+    # based on the panelId query parameter found in the url.
+    #
+    # If no panel is specified, defaults to the first valid panel.
     class DatasourceNameParser
       def initialize(grafana_url, grafana_dashboard)
         @grafana_url, @grafana_dashboard = grafana_url, grafana_dashboard
@@ -146,15 +148,29 @@ module Metrics
       def parse
         @grafana_dashboard[:dashboard][:panels]
-          .find { |panel| panel[:id].to_s == query_params[:panelId] }
+          .find { |panel| panel_id ? matching_panel?(panel) : valid_panel?(panel) }
           .try(:[], :datasource)
       end
       private
+      def panel_id
+        query_params[:panelId]
+      end
+
       def query_params
         Gitlab::Metrics::Dashboard::Url.parse_query(@grafana_url)
       end
+
+      def matching_panel?(panel)
+        panel[:id].to_s == panel_id
+      end
+
+      def valid_panel?(panel)
+        ::Grafana::Validator
+          .new(@grafana_dashboard, nil, panel, query_params)
+          .valid?
+      end
     end
   end
 end

changelogs/unreleased/19880-sort-closed-issues-by-recently-closed.yml

+---
+title: Sort closed issues on issue boards using time of closing
+merge_request: 23442
+author: briankabiro
+type: changed

changelogs/unreleased/204801-add-instance-to-services.yml

+---
+title: Add instance column to services table
+merge_request: 25714
+author:
+type: other

changelogs/unreleased/206899-move-system-metrics-chart-group-to-the-top-of-the-default-dashbord.yml

+---
+title: Put System Metrics chart group first in default dashboard
+merge_request: 26355
+author:
+type: other

changelogs/unreleased/208887-optimize-project-counters-projects_with_repositories_enabled.yml

+---
+title: Optimize Project counters with respository enabled counter
+merge_request: 26698
+author:
+type: performance

changelogs/unreleased/fix-missing-rss-feed-events.yml

----
-title: Fix missing RSS feed events
-merge_request: 19524
-author:
-type: fixed

changelogs/unreleased/sy-grafana-default-panel.yml

+---
+title: Default to first valid panel in unspecified Grafana embeds
+merge_request: 21932
+author:
+type: changed

changelogs/unreleased/udpate-cluster-application-image-to-0-11.yml

+---
+title: Update cluster-applications image to v0.11 with a runner bugfix, updated cert-manager,
+  and vault as a new app
+merge_request: 26842
+author:
+type: changed

config/prometheus/common_metrics.yml

 dashboard: 'Environment metrics'
 priority: 1
 panel_groups:
+- group: System metrics (Kubernetes)
+  priority: 15
+  panels:
+  - title: "Memory Usage (Total)"
+    type: "area-chart"
+    y_label: "Total Memory Used (GB)"
+    weight: 4
+    metrics:
+    - id: system_metrics_kubernetes_container_memory_total
+      query_range: 'avg(sum(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-(.*)",namespace="%{kube_namespace}"}) by (job)) without (job)  /1024/1024/1024'
+      label: Total (GB)
+      unit: GB
+  - title: "Core Usage (Total)"
+    type: "area-chart"
+    y_label: "Total Cores"
+    weight: 3
+    metrics:
+    - id: system_metrics_kubernetes_container_cores_total
+      query_range: 'avg(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-(.*)",namespace="%{kube_namespace}"}[15m])) by (job)) without (job)'
+      label: Total (cores)
+      unit: "cores"
+  - title: "Memory Usage (Pod average)"
+    type: "line-chart"
+    y_label: "Memory Used per Pod (MB)"
+    weight: 2
+    metrics:
+    - id: system_metrics_kubernetes_container_memory_average
+      query_range: 'avg(sum(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-([^c].*|c([^a]|a([^n]|n([^a]|a([^r]|r[^y])))).*|)-(.*)",namespace="%{kube_namespace}"}) by (job)) without (job) / count(avg(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-([^c].*|c([^a]|a([^n]|n([^a]|a([^r]|r[^y])))).*|)-(.*)",namespace="%{kube_namespace}"}) without (job)) /1024/1024'
+      label: Pod average (MB)
+      unit: MB
+  - title: "Canary: Memory Usage (Pod Average)"
+    type: "line-chart"
+    y_label: "Memory Used per Pod (MB)"
+    weight: 2
+    metrics:
+    - id: system_metrics_kubernetes_container_memory_average_canary
+      query_range: 'avg(sum(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-canary-(.*)",namespace="%{kube_namespace}"}) by (job)) without (job) / count(avg(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-canary-(.*)",namespace="%{kube_namespace}"}) without (job)) /1024/1024'
+      label: Pod average (MB)
+      unit: MB
+      track: canary
+  - title: "Core Usage (Pod Average)"
+    type: "line-chart"
+    y_label: "Cores per Pod"
+    weight: 1
+    metrics:
+    - id: system_metrics_kubernetes_container_core_usage
+      query_range: 'avg(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-([^c].*|c([^a]|a([^n]|n([^a]|a([^r]|r[^y])))).*|)-(.*)",namespace="%{kube_namespace}"}[15m])) by (job)) without (job) / count(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-([^c].*|c([^a]|a([^n]|n([^a]|a([^r]|r[^y])))).*|)-(.*)",namespace="%{kube_namespace}"}[15m])) by (pod_name))'
+      label: Pod average (cores)
+      unit: "cores"
+  - title: "Canary: Core Usage (Pod Average)"
+    type: "line-chart"
+    y_label: "Cores per Pod"
+    weight: 1
+    metrics:
+    - id: system_metrics_kubernetes_container_core_usage_canary
+      query_range: 'avg(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-canary-(.*)",namespace="%{kube_namespace}"}[15m])) by (job)) without (job) / count(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-canary-(.*)",namespace="%{kube_namespace}"}[15m])) by (pod_name))'
+      label: Pod average (cores)
+      unit: "cores"
+      track: canary
+  - title: "Knative function invocations"
+    type: "area-chart"
+    y_label: "Invocations"
+    weight: 1
+    metrics:
+    - id: system_metrics_knative_function_invocation_count
+      query_range: 'sum(ceil(rate(istio_requests_total{destination_service_namespace="%{kube_namespace}", destination_service=~"%{function_name}.*"}[1m])*60))'
+      label: invocations / minute
+      unit: requests
 # NGINX Ingress metrics for pre-0.16.0 versions
 - group: Response metrics (NGINX Ingress VTS)
   priority: 10
@@ -150,79 +218,3 @@ panel_groups:
       query_range: 'sum(rate(nginx_server_requests{code="5xx", %{environment_filter}}[2m]))'
       label: HTTP Errors
       unit: "errors / sec"
-- group: System metrics (Kubernetes)
-  priority: 5
-  panels:
-  - title: "Memory Usage (Total)"
-    type: "area-chart"
-    y_label: "Total Memory Used (GB)"
-    y_axis:
-      format: "gibibytes"
-    weight: 4
-    metrics:
-    - id: system_metrics_kubernetes_container_memory_total
-      query_range: 'avg(sum(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-(.*)",namespace="%{kube_namespace}"}) by (job)) without (job)  /1024/1024/1024'
-      label: Total (GB)
-      unit: GB
-  - title: "Core Usage (Total)"
-    type: "area-chart"
-    y_label: "Total Cores"
-    weight: 3
-    metrics:
-    - id: system_metrics_kubernetes_container_cores_total
-      query_range: 'avg(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-(.*)",namespace="%{kube_namespace}"}[15m])) by (job)) without (job)'
-      label: Total (cores)
-      unit: "cores"
-  - title: "Memory Usage (Pod average)"
-    type: "line-chart"
-    y_label: "Memory Used per Pod (MB)"
-    y_axis:
-      format: "mebibytes"
-    weight: 2
-    metrics:
-    - id: system_metrics_kubernetes_container_memory_average
-      query_range: 'avg(sum(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-([^c].*|c([^a]|a([^n]|n([^a]|a([^r]|r[^y])))).*|)-(.*)",namespace="%{kube_namespace}"}) by (job)) without (job) / count(avg(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-([^c].*|c([^a]|a([^n]|n([^a]|a([^r]|r[^y])))).*|)-(.*)",namespace="%{kube_namespace}"}) without (job)) /1024/1024'
-      label: Pod average (MB)
-      unit: MB
-  - title: "Canary: Memory Usage (Pod Average)"
-    type: "line-chart"
-    y_label: "Memory Used per Pod (MB)"
-    y_axis:
-      format: "mebibytes"
-    weight: 2
-    metrics:
-    - id: system_metrics_kubernetes_container_memory_average_canary
-      query_range: 'avg(sum(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-canary-(.*)",namespace="%{kube_namespace}"}) by (job)) without (job) / count(avg(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-canary-(.*)",namespace="%{kube_namespace}"}) without (job)) /1024/1024'
-      label: Pod average (MB)
-      unit: MB
-      track: canary
-  - title: "Core Usage (Pod Average)"
-    type: "line-chart"
-    y_label: "Cores per Pod"
-    weight: 1
-    metrics:
-    - id: system_metrics_kubernetes_container_core_usage
-      query_range: 'avg(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-([^c].*|c([^a]|a([^n]|n([^a]|a([^r]|r[^y])))).*|)-(.*)",namespace="%{kube_namespace}"}[15m])) by (job)) without (job) / count(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-([^c].*|c([^a]|a([^n]|n([^a]|a([^r]|r[^y])))).*|)-(.*)",namespace="%{kube_namespace}"}[15m])) by (pod_name))'
-      label: Pod average (cores)
-      unit: "cores"
-  - title: "Canary: Core Usage (Pod Average)"
-    type: "line-chart"
-    y_label: "Cores per Pod"
-    weight: 1
-    metrics:
-    - id: system_metrics_kubernetes_container_core_usage_canary
-      query_range: 'avg(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-canary-(.*)",namespace="%{kube_namespace}"}[15m])) by (job)) without (job) / count(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-canary-(.*)",namespace="%{kube_namespace}"}[15m])) by (pod_name))'
-      label: Pod average (cores)
-      unit: "cores"
-      track: canary
-  - title: "Knative function invocations"
-    type: "area-chart"
-    y_label: "Invocations"
-    y_axis:
-      precision: 0
-    weight: 1
-    metrics:
-    - id: system_metrics_knative_function_invocation_count
-      query_range: 'sum(ceil(rate(istio_requests_total{destination_service_namespace="%{kube_namespace}", destination_service=~"%{function_name}.*"}[1m])*60))'
-      label: invocations / minute
-      unit: requests

db/migrate/20200309140540_add_index_on_project_id_and_repository_access_level_to_project_features.rb

+# frozen_string_literal: true
+
+class AddIndexOnProjectIdAndRepositoryAccessLevelToProjectFeatures < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  INDEX_NAME = 'index_project_features_on_project_id_ral_20'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :project_features, :project_id, where: 'repository_access_level = 20', name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :project_features, INDEX_NAME
+  end
+end

db/migrate/20200310132654_add_instance_to_services.rb

+# frozen_string_literal: true
+
+class AddInstanceToServices < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_column_with_default(:services, :instance, :boolean, default: false)
+  end
+
+  def down
+    remove_column(:services, :instance)
+  end
+end

db/migrate/20200310135823_add_index_to_service_unique_instance_per_type.rb

+# frozen_string_literal: true
+
+class AddIndexToServiceUniqueInstancePerType < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index(:services, [:type, :instance], unique: true, where: 'instance IS TRUE')
+  end
+
+  def down
+    remove_concurrent_index(:services, [:type, :instance])
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2020_03_09_195710) do
+ActiveRecord::Schema.define(version: 2020_03_10_135823) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_trgm"
@@ -3265,6 +3265,7 @@ ActiveRecord::Schema.define(version: 2020_03_09_195710) do
     t.integer "forking_access_level"
     t.index ["project_id"], name: "index_project_features_on_project_id", unique: true
     t.index ["project_id"], name: "index_project_features_on_project_id_bal_20", where: "(builds_access_level = 20)"
+    t.index ["project_id"], name: "index_project_features_on_project_id_ral_20", where: "(repository_access_level = 20)"
   end
   create_table "project_group_links", id: :serial, force: :cascade do |t|
@@ -3939,8 +3940,10 @@ ActiveRecord::Schema.define(version: 2020_03_09_195710) do
     t.string "description", limit: 500
     t.boolean "comment_on_event_enabled", default: true, null: false
     t.boolean "template", default: false
+    t.boolean "instance", default: false, null: false
     t.index ["project_id"], name: "index_services_on_project_id"
     t.index ["template"], name: "index_services_on_template"
+    t.index ["type", "instance"], name: "index_services_on_type_and_instance", unique: true, where: "(instance IS TRUE)"
     t.index ["type", "template"], name: "index_services_on_type_and_template", unique: true, where: "(template IS TRUE)"
     t.index ["type"], name: "index_services_on_type"
   end

doc/api/graphql/reference/gitlab_schema.graphql

@@ -2023,6 +2023,11 @@ type Epic implements Noteable {
   """
   hasIssues: Boolean!
+  """
+  Current health status of the epic
+  """
+  healthStatus: EpicHealthStatus
+
   """
   ID of the epic
   """
@@ -2349,6 +2354,26 @@ type EpicEdge {
   node: Epic
 }
+"""
+Health status of child issues
+"""
+type EpicHealthStatus {
+  """
+  Number of issues at risk
+  """
+  issuesAtRisk: Int
+
+  """
+  Number of issues that need attention
+  """
+  issuesNeedingAttention: Int
+
+  """
+  Number of issues on track
+  """
+  issuesOnTrack: Int
+}
+
 """
 Relationship between an epic and an issue
 """