Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/blob/components/blob_header_default_actions.vue

+<script>
+import { GlButton, GlButtonGroup, GlIcon, GlTooltipDirective } from '@gitlab/ui';
+import { BTN_COPY_CONTENTS_TITLE, BTN_DOWNLOAD_TITLE, BTN_RAW_TITLE } from './constants';
+
+export default {
+  components: {
+    GlIcon,
+    GlButtonGroup,
+    GlButton,
+  },
+  directives: {
+    GlTooltip: GlTooltipDirective,
+  },
+  props: {
+    blob: {
+      type: Object,
+      required: true,
+    },
+  },
+  computed: {
+    rawUrl() {
+      return this.blob.rawPath;
+    },
+    downloadUrl() {
+      return `${this.blob.rawPath}?inline=false`;
+    },
+  },
+  methods: {
+    requestCopyContents() {
+      this.$emit('copy');
+    },
+  },
+  BTN_COPY_CONTENTS_TITLE,
+  BTN_DOWNLOAD_TITLE,
+  BTN_RAW_TITLE,
+};
+</script>
+<template>
+  <gl-button-group>
+    <gl-button
+      v-gl-tooltip.hover
+      :aria-label="$options.BTN_COPY_CONTENTS_TITLE"
+      :title="$options.BTN_COPY_CONTENTS_TITLE"
+      @click="requestCopyContents"
+    >
+      <gl-icon name="copy-to-clipboard" :size="14" />
+    </gl-button>
+    <gl-button
+      v-gl-tooltip.hover
+      :aria-label="$options.BTN_RAW_TITLE"
+      :title="$options.BTN_RAW_TITLE"
+      :href="rawUrl"
+      target="_blank"
+    >
+      <gl-icon name="doc-code" :size="14" />
+    </gl-button>
+    <gl-button
+      v-gl-tooltip.hover
+      :aria-label="$options.BTN_DOWNLOAD_TITLE"
+      :title="$options.BTN_DOWNLOAD_TITLE"
+      :href="downloadUrl"
+      target="_blank"
+    >
+      <gl-icon name="download" :size="14" />
+    </gl-button>
+  </gl-button-group>
+</template>

app/assets/javascripts/blob/components/constants.js

+import { __ } from '~/locale';
+
+export const BTN_COPY_CONTENTS_TITLE = __('Copy file contents');
+export const BTN_RAW_TITLE = __('Open raw');
+export const BTN_DOWNLOAD_TITLE = __('Download');

app/assets/javascripts/pipelines/components/pipelines_table_row.vue

@@ -75,9 +75,9 @@ export default {
      * This field needs a lot of verification, because of different possible cases:
      *
      * 1. person who is an author of a commit might be a GitLab user
-     * 2. if person who is an author of a commit is a GitLab user he/she can have a GitLab avatar
-     * 3. If GitLab user does not have avatar he/she might have a Gravatar
-     * 4. If committer is not a GitLab User he/she can have a Gravatar
+     * 2. if person who is an author of a commit is a GitLab user, they can have a GitLab avatar
+     * 3. If GitLab user does not have avatar they might have a Gravatar
+     * 4. If committer is not a GitLab User they can have a Gravatar
      * 5. We do not have consistent API object in this case
      * 6. We should improve API and the code
      *
@@ -93,17 +93,17 @@ export default {
       // 1. person who is an author of a commit might be a GitLab user
       if (this.pipeline.commit.author) {
         // 2. if person who is an author of a commit is a GitLab user
-        // he/she can have a GitLab avatar
+        // they can have a GitLab avatar
         if (this.pipeline.commit.author.avatar_url) {
           commitAuthorInformation = this.pipeline.commit.author;
-          // 3. If GitLab user does not have avatar he/she might have a Gravatar
+          // 3. If GitLab user does not have avatar, they might have a Gravatar
         } else if (this.pipeline.commit.author_gravatar_url) {
           commitAuthorInformation = Object.assign({}, this.pipeline.commit.author, {
             avatar_url: this.pipeline.commit.author_gravatar_url,
           });
         }
-        // 4. If committer is not a GitLab User he/she can have a Gravatar
+        // 4. If committer is not a GitLab User, they can have a Gravatar
       } else {
         commitAuthorInformation = {
           avatar_url: this.pipeline.commit.author_gravatar_url,

app/controllers/root_controller.rb

@@ -52,7 +52,7 @@ class RootController < Dashboard::ProjectsController
   end
   def redirect_to_home_page_url?
-    # If user is not signed-in and tries to access root_path - redirect him to landing page
+    # If user is not signed-in and tries to access root_path - redirect them to landing page
     # Don't redirect to the default URL to prevent endless redirections
     return false unless Gitlab::CurrentSettings.home_page_url.present?

app/models/board.rb

@@ -11,7 +11,10 @@ class Board < ApplicationRecord
   validates :group, presence: true, unless: :project
   scope :with_associations, -> { preload(:destroyable_lists) }
-  scope :order_by_name_asc, -> { order(arel_table[:name].lower.asc) }
+
+  # Sort by case-insensitive name, then ascending ids. This ensures that we will always
+  # get the same list/first board no matter how many other boards are named the same
+  scope :order_by_name_asc, -> { order(arel_table[:name].lower.asc).order(id: :asc) }
   scope :first_board, -> { where(id: self.order_by_name_asc.limit(1).select(:id)) }
   def project_needed?

app/policies/project_policy.rb

@@ -370,7 +370,7 @@ class ProjectPolicy < BasePolicy
   # There's two separate cases when builds_disabled is true:
   # 1. When internal CI is disabled - builds_disabled && internal_builds_disabled
-  #   - We do not prevent the user from accessing Pipelines to allow him to access external CI
+  #   - We do not prevent the user from accessing Pipelines to allow them to access external CI
   # 2. When the user is not allowed to access CI - builds_disabled && ~internal_builds_disabled
   #   - We prevent the user from accessing Pipelines
   rule { (builds_disabled & ~internal_builds_disabled) | repository_disabled }.policy do

app/services/projects/overwrite_project_service.rb

@@ -61,7 +61,7 @@ module Projects
     def add_source_project_to_fork_network(source_project)
       return unless @project.fork_network
-      # Because he have moved all references in the fork network from the source_project
+      # Because they have moved all references in the fork network from the source_project
       # we won't be able to query the database (only through its cached data),
       # for its former relationships. That's why we're adding it to the network
       # as a fork of the target project

changelogs/unreleased/37335-conan-name-validation.yml

----
-title: Conan packages are validated based on full recipe instead of name/version alone
-merge_request: 23467
-author:
-type: changed

changelogs/unreleased/bw-fix-board-sorting.yml

+---
+title: Ensure board lists are sorted consistently
+merge_request: 24637
+author:
+type: fixed

changelogs/unreleased/sh-revert-prometheus-application-migration.yml

+---
+title: Clean backgroud_migration queue from ActivatePrometheusServicesForSharedCluster
+  jobs.
+merge_request: 24135
+author:
+type: fixed

changelogs/unreleased/sh-sanitize-api-request-parameters.yml

+---
+title: Sanitize request parameters in exceptions_json.log
+merge_request: 24625
+author:
+type: fixed

config/gitlab.yml.example

@@ -111,7 +111,7 @@ production: &base
     # Email server smtp settings are in config/initializers/smtp_settings.rb.sample
     # default_can_create_group: false  # default: true
-    # username_changing_enabled: false # default: true - User can change her username/namespace
+    # username_changing_enabled: false # default: true - User can change their username/namespace
     ## Default theme ID
     ##   1 - Indigo
     ##   2 - Dark

db/migrate/20200116051619_drop_activate_prometheus_services_for_shared_cluster_applications_background_migration.rb

+# frozen_string_literal: true
+
+class DropActivatePrometheusServicesForSharedClusterApplicationsBackgroundMigration < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  DROPPED_JOB_CLASS = 'ActivatePrometheusServicesForSharedClusterApplications'
+  QUEUE = 'background_migration'
+
+  def up
+    Sidekiq::Queue.new(QUEUE).each do |job|
+      klass, project_id, *should_be_empty = job.args
+      next unless klass == DROPPED_JOB_CLASS && project_id.is_a?(Integer) && should_be_empty.empty?
+
+      job.delete
+    end
+  end
+end

db/migrate/20200129234037_replace_conan_metadata_index.rb

-# frozen_string_literal: true
-
-class ReplaceConanMetadataIndex < ActiveRecord::Migration[5.2]
-  include Gitlab::Database::MigrationHelpers
-
-  DOWNTIME = false
-  OLD_INDEX = 'index_packages_conan_metadata_on_package_id'
-  NEW_INDEX = 'index_packages_conan_metadata_on_package_id_username_channel'
-
-  disable_ddl_transaction!
-
-  def up
-    add_concurrent_index :packages_conan_metadata,
-                         [:package_id, :package_username, :package_channel],
-                         unique: true, name: NEW_INDEX
-
-    remove_concurrent_index_by_name :packages_conan_metadata, OLD_INDEX
-  end
-
-  def down
-    add_concurrent_index :packages_conan_metadata, :package_id, name: OLD_INDEX
-
-    remove_concurrent_index_by_name :packages_conan_metadata, NEW_INDEX
-  end
-end

db/post_migrate/20200114113341_patch_prometheus_services_for_shared_cluster_applications.rb

 # frozen_string_literal: true
 class PatchPrometheusServicesForSharedClusterApplications < ActiveRecord::Migration[5.2]
-  include Gitlab::Database::MigrationHelpers
-
-  DOWNTIME = false
-  MIGRATION = 'ActivatePrometheusServicesForSharedClusterApplications'.freeze
-  BATCH_SIZE = 500
-  DELAY = 2.minutes
-
-  disable_ddl_transaction!
-
-  module Migratable
-    module Applications
-      class Prometheus < ActiveRecord::Base
-        self.table_name = 'clusters_applications_prometheus'
-
-        enum status: {
-          errored: -1,
-          installed: 3,
-          updated: 5
-        }
-      end
-    end
-
-    class Project < ActiveRecord::Base
-      self.table_name = 'projects'
-      include ::EachBatch
-
-      scope :with_application_on_group_clusters, -> {
-        joins("INNER JOIN namespaces ON namespaces.id = projects.namespace_id")
-          .joins("INNER JOIN cluster_groups ON cluster_groups.group_id = namespaces.id")
-          .joins("INNER JOIN clusters ON clusters.id = cluster_groups.cluster_id AND clusters.cluster_type = #{Cluster.cluster_types['group_type']}")
-          .joins("INNER JOIN clusters_applications_prometheus ON clusters_applications_prometheus.cluster_id = clusters.id
-                      AND clusters_applications_prometheus.status IN (#{Applications::Prometheus.statuses[:installed]}, #{Applications::Prometheus.statuses[:updated]})")
-      }
-
-      scope :without_active_prometheus_services, -> {
-        joins("LEFT JOIN services ON services.project_id = projects.id AND services.type = 'PrometheusService'")
-          .where("services.id IS NULL OR (services.active = FALSE AND services.properties = '{}')")
-      }
-    end
-
-    class Cluster < ActiveRecord::Base
-      self.table_name = 'clusters'
-
-      enum cluster_type: {
-        instance_type: 1,
-        group_type: 2
-      }
-
-      def self.has_prometheus_application?
-        joins("INNER JOIN clusters_applications_prometheus ON clusters_applications_prometheus.cluster_id = clusters.id
-                   AND clusters_applications_prometheus.status IN (#{Applications::Prometheus.statuses[:installed]}, #{Applications::Prometheus.statuses[:updated]})").exists?
-      end
-    end
-  end
-
   def up
-    projects_without_active_prometheus_service.group('projects.id').each_batch(of: BATCH_SIZE) do |batch, index|
-      bg_migrations_batch = batch.select('projects.id').map { |project| [MIGRATION, project.id] }
-      delay = index * DELAY
-      BackgroundMigrationWorker.bulk_perform_in(delay.seconds, bg_migrations_batch)
-    end
+    # no-op
   end
   def down
     # no-op
   end
-
-  private
-
-  def projects_without_active_prometheus_service
-    scope = Migratable::Project.without_active_prometheus_services
-
-    return scope if migrate_instance_cluster?
-
-    scope.with_application_on_group_clusters
-  end
-
-  def migrate_instance_cluster?
-    if instance_variable_defined?('@migrate_instance_cluster')
-      @migrate_instance_cluster
-    else
-      @migrate_instance_cluster = Migratable::Cluster.instance_type.has_prometheus_application?
-    end
-  end
 end

db/schema.rb

@@ -2945,7 +2945,7 @@ ActiveRecord::Schema.define(version: 2020_02_06_111847) do
     t.datetime_with_timezone "updated_at", null: false
     t.string "package_username", limit: 255, null: false
     t.string "package_channel", limit: 255, null: false
-    t.index ["package_id", "package_username", "package_channel"], name: "index_packages_conan_metadata_on_package_id_username_channel", unique: true
+    t.index ["package_id"], name: "index_packages_conan_metadata_on_package_id", unique: true
   end
   create_table "packages_dependencies", force: :cascade do |t|

doc/administration/monitoring/gitlab_self_monitoring_project/index.md

@@ -48,3 +48,10 @@ to the Prometheus config in order for GitLab to receive notifications of any ale
 Once the webhook is setup, you can
 [take action on incoming alerts](../../../user/project/integrations/prometheus.md#taking-action-on-incidents-ultimate).
+
+## Adding custom metrics to the self monitoring project
+
+You can add custom metrics in the self monitoring project by:
+
+1. [Duplicating](../../../user/project/integrations/prometheus.md#duplicating-a-gitlab-defined-dashboard) the default dashboard.
+1. [Editing](../../../user/project/integrations/prometheus.md#view-and-edit-the-source-file-of-a-custom-dashboard) the newly created dashboard file and configuring it with [dashboard YAML properties](../../../user/project/integrations/prometheus.md#dashboard-yaml-properties).

doc/administration/user_settings.md

@@ -31,5 +31,5 @@ gitlab_rails['gitlab_username_changing_enabled'] = false
 For source installations, uncomment the following line in `config/gitlab.yml`:
 ```yaml
-# username_changing_enabled: false # default: true - User can change her username/namespace
+# username_changing_enabled: false # default: true - User can change their username/namespace
 ```

doc/api/members.md

@@ -64,7 +64,7 @@ Example response:
 Gets a list of group or project members viewable by the authenticated user, including inherited members through ancestor groups.
 When a user is a member of the project/group and of one or more ancestor groups the user is returned only once with the project `access_level` (if exists)
-or the `access_level` for the user in the first group which he belongs to in the project groups ancestors chain.
+or the `access_level` for the user in the first group which they belong to in the project groups ancestors chain.
 ```
 GET /groups/:id/members/all

doc/development/documentation/structure.md

@@ -96,8 +96,10 @@ Link each one to an appropriate place for more information.
 This is the part of the document where you can include one or more sets of instructions, each to accomplish a specific task.
 Headers should describe the task the reader will achieve by following the instructions within, typically starting with a verb.
 Larger instruction sets may have subsections covering specific phases of the process.
+Where appropriate, provide examples of code or configuration files to better clarify intended usage.
 - Write a step-by-step guide, with no gaps between the steps.
+- Include example code or configurations as part of the relevant step. Use appropriate markdown to [wrap code blocks with syntax highlighting](../../user/markdown.html#colored-code-and-syntax-highlighting).
 - Start with an h2 (`##`), break complex steps into small steps using
 subheadings h3 > h4 > h5 > h6. _Never skip a hierarchy level, such
 as h2 > h4_, as it will break the TOC and may affect the breadcrumbs.