Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/logs/components/environment_logs.vue

@@ -3,8 +3,10 @@ import { throttle } from 'lodash';
 import { mapActions, mapState, mapGetters } from 'vuex';
 import {
   GlSprintf,
+  GlIcon,
   GlAlert,
   GlDropdown,
+  GlDropdownHeader,
   GlDropdownDivider,
   GlDropdownItem,
   GlFormGroup,
@@ -22,8 +24,10 @@ import { formatDate } from '../utils';
 export default {
   components: {
     GlSprintf,
+    GlIcon,
     GlAlert,
     GlDropdown,
+    GlDropdownHeader,
     GlDropdownDivider,
     GlDropdownItem,
     GlFormGroup,
@@ -124,6 +128,12 @@ export default {
       'fetchMoreLogsPrepend',
     ]),
+    isCurrentEnvironment(envName) {
+      return envName === this.environments.current;
+    },
+    isCurrentPod(podName) {
+      return podName === this.pods.current;
+    },
     topReached() {
       if (!this.logs.isLoading) {
         this.fetchMoreLogsPrepend();
@@ -161,7 +171,6 @@ export default {
       <div class="row mx-n1">
         <gl-form-group
           id="environments-dropdown-fg"
-          :label="s__('Environments|Environment')"
           label-size="sm"
           label-for="environments-dropdown"
           class="col-3 px-1"
@@ -173,18 +182,27 @@ export default {
             class="d-flex gl-h-32 js-environments-dropdown"
             toggle-class="dropdown-menu-toggle"
           >
+            <gl-dropdown-header class="text-center">
+              {{ s__('Environments|Select environment') }}
+            </gl-dropdown-header>
             <gl-dropdown-item
               v-for="env in environments.options"
               :key="env.id"
               @click="showEnvironment(env.name)"
             >
-              {{ env.name }}
+              <div class="d-flex">
+                <gl-icon
+                  :class="{ invisible: !isCurrentEnvironment(env.name) }"
+                  name="status_success_borderless"
+                />
+                <div class="flex-grow-1">{{ env.name }}</div>
+              </div>
             </gl-dropdown-item>
           </gl-dropdown>
         </gl-form-group>
+
         <gl-form-group
           id="pods-dropdown-fg"
-          :label="s__('Environments|Logs from')"
           label-size="sm"
           label-for="pods-dropdown"
           class="col-3 px-1"
@@ -196,24 +214,58 @@ export default {
             class="d-flex gl-h-32 js-pods-dropdown"
             toggle-class="dropdown-menu-toggle"
           >
+            <gl-dropdown-header class="text-center">
+              {{ s__('Environments|Filter by pod') }}
+            </gl-dropdown-header>
+
             <template v-if="advancedFeaturesEnabled">
               <gl-dropdown-item key="all-pods" @click="showPodLogs(null)">
-                {{ s__('Environments|All pods') }}
+                <div class="d-flex">
+                  <gl-icon
+                    :class="{ invisible: !isCurrentPod(null) }"
+                    name="status_success_borderless"
+                  />
+                  <div class="flex-grow-1">{{ s__('Environments|All pods') }}</div>
+                </div>
               </gl-dropdown-item>
               <gl-dropdown-divider />
             </template>
+
+            <gl-dropdown-item v-if="!pods.options.length" :disabled="true">
+              <span class="text-muted">
+                {{ s__('Environments|No pods to display') }}
+              </span>
+            </gl-dropdown-item>
             <gl-dropdown-item
               v-for="podName in pods.options"
               :key="podName"
+              class="text-nowrap"
               @click="showPodLogs(podName)"
             >
-              {{ podName }}
+              <div class="d-flex">
+                <gl-icon
+                  :class="{ invisible: !isCurrentPod(podName) }"
+                  name="status_success_borderless"
+                />
+                <div class="flex-grow-1">{{ podName }}</div>
+              </div>
             </gl-dropdown-item>
           </gl-dropdown>
         </gl-form-group>
+        <gl-form-group id="search-fg" label-size="sm" label-for="search" class="col-3 px-1">
+          <gl-search-box-by-click
+            v-model.trim="searchQuery"
+            :disabled="disableAdvancedControls"
+            :placeholder="s__('Environments|Search')"
+            class="js-logs-search"
+            type="search"
+            autofocus
+            @submit="setSearch(searchQuery)"
+          />
+        </gl-form-group>
+
         <gl-form-group
           id="dates-fg"
-          :label="s__('Environments|Show last')"
           label-size="sm"
           label-for="time-window-dropdown"
           class="col-3 px-1"
@@ -222,32 +274,16 @@ export default {
             ref="dateTimePicker"
             v-model="timeRangeModel"
             class="w-100 gl-h-32"
+            right
             :disabled="disableAdvancedControls"
             :options="timeRanges"
           />
         </gl-form-group>
-        <gl-form-group
-          id="search-fg"
-          :label="s__('Environments|Search')"
-          label-size="sm"
-          label-for="search"
-          class="col-3 px-1"
-        >
-          <gl-search-box-by-click
-            v-model.trim="searchQuery"
-            :disabled="disableAdvancedControls"
-            :placeholder="s__('Environments|Search')"
-            class="js-logs-search"
-            type="search"
-            autofocus
-            @submit="setSearch(searchQuery)"
-          />
-        </gl-form-group>
       </div>
       <log-control-buttons
         ref="scrollButtons"
-        class="controllers align-self-end mb-1"
+        class="controllers"
         :scroll-down-button-disabled="scrollDownButtonDisabled"
         @refresh="showPodLogs(pods.current)"
         @scrollDown="scrollDown"

app/assets/stylesheets/pages/builds.scss

@@ -379,7 +379,7 @@
   }
   .top-bar {
-    @include build-trace-top-bar($gl-line-height * 5);
+    @include build-trace-top-bar($gl-line-height * 3);
     position: relative;
     top: 0;

app/models/event.rb

@@ -6,6 +6,7 @@ class Event < ApplicationRecord
   include Presentable
   include DeleteWithLimit
   include CreatedAtFilterable
+  include Gitlab::Utils::StrongMemoize
   default_scope { reorder(nil) }
@@ -42,7 +43,8 @@ class Event < ApplicationRecord
     note:           Note,
     project:        Project,
     snippet:        Snippet,
-    user:           User
+    user:           User,
+    wiki:           WikiPage::Meta
   ).freeze
   RESET_PROJECT_ACTIVITY_INTERVAL = 1.hour
@@ -79,6 +81,7 @@ class Event < ApplicationRecord
   scope :recent, -> { reorder(id: :desc) }
   scope :code_push, -> { where(action: PUSHED) }
   scope :merged, -> { where(action: MERGED) }
+  scope :for_wiki_page, -> { where(target_type: WikiPage::Meta.name) }
   scope :with_associations, -> do
     # We're using preload for "push_event_payload" as otherwise the association
@@ -197,6 +200,14 @@ class Event < ApplicationRecord
     created_action? && !target && target_type.nil?
   end
+  def created_wiki_page?
+    wiki_page? && action == CREATED
+  end
+
+  def updated_wiki_page?
+    wiki_page? && action == UPDATED
+  end
+
   def created_target?
     created_action? && target
   end
@@ -217,6 +228,10 @@ class Event < ApplicationRecord
     target_type == "MergeRequest"
   end
+  def wiki_page?
+    target_type == WikiPage::Meta.name
+  end
+
   def milestone
     target if milestone?
   end
@@ -229,6 +244,14 @@ class Event < ApplicationRecord
     target if merge_request?
   end
+  def wiki_page
+    strong_memoize(:wiki_page) do
+      next unless wiki_page?
+
+      ProjectWiki.new(project, author).find_page(target.canonical_slug)
+    end
+  end
+
   def note
     target if note?
   end
@@ -250,6 +273,10 @@ class Event < ApplicationRecord
       'destroyed'
     elsif commented_action?
       "commented on"
+    elsif created_wiki_page?
+      'created'
+    elsif updated_wiki_page?
+      'updated'
     elsif created_project_action?
       created_project_action_name
     else
@@ -362,6 +389,8 @@ class Event < ApplicationRecord
                         :read_snippet
                       elsif milestone?
                         :read_milestone
+                      elsif wiki_page?
+                        :read_wiki
                       end
                     end
   end

app/models/project_wiki.rb

@@ -19,10 +19,11 @@ class ProjectWiki
   DIRECTION_DESC = 'desc'
   DIRECTION_ASC = 'asc'
+  attr_reader :project, :user
+
   # Returns a string describing what went wrong after
   # an operation fails.
   attr_reader :error_message
-  attr_reader :project
   def initialize(project, user = nil)
     @project = project
@@ -196,9 +197,9 @@ class ProjectWiki
   def commit_details(action, message = nil, title = nil)
     commit_message = message.presence || default_message(action, title)
-    git_user = Gitlab::Git::User.from_gitlab(@user)
-    Gitlab::Git::Wiki::CommitDetails.new(@user.id,
+    git_user = Gitlab::Git::User.from_gitlab(user)
+    Gitlab::Git::Wiki::CommitDetails.new(user.id,
                                          git_user.username,
                                          git_user.name,
                                          git_user.email,
@@ -206,7 +207,7 @@ class ProjectWiki
   end
   def default_message(action, title)
-    "#{@user.username} #{action} page: #{title}"
+    "#{user.username} #{action} page: #{title}"
   end
   def update_project_activity

app/models/wiki_page.rb

@@ -21,6 +21,14 @@ class WikiPage
     ActiveModel::Name.new(self, nil, 'wiki')
   end
+  def eql?(other)
+    return false unless other.present? && other.is_a?(self.class)
+
+    slug == other.slug && wiki.project == other.wiki.project
+  end
+
+  alias_method :==, :eql?
+
   # Sorts and groups pages by directory.
   #
   # pages - an array of WikiPage objects.
@@ -58,6 +66,7 @@ class WikiPage
   # The GitLab ProjectWiki instance.
   attr_reader :wiki
+  delegate :project, to: :wiki
   # The raw Gitlab::Git::WikiPage instance.
   attr_reader :page
@@ -70,6 +79,10 @@ class WikiPage
     Gitlab::HookData::WikiPageBuilder.new(self).build
   end
+  # Construct a new WikiPage
+  #
+  # @param [ProjectWiki] wiki
+  # @param [Gitlab::Git::WikiPage] page
   def initialize(wiki, page = nil)
     @wiki       = wiki
     @page       = page

app/models/wiki_page/meta.rb

+# frozen_string_literal: true
+
+class WikiPage
+  class Meta < ApplicationRecord
+    include Gitlab::Utils::StrongMemoize
+
+    CanonicalSlugConflictError = Class.new(ActiveRecord::RecordInvalid)
+
+    self.table_name = 'wiki_page_meta'
+
+    belongs_to :project
+
+    has_many :slugs, class_name: 'WikiPage::Slug', foreign_key: 'wiki_page_meta_id', inverse_of: :wiki_page_meta
+    has_many :events, as: :target, dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent
+
+    validates :title, presence: true
+    validates :project_id, presence: true
+    validate :no_two_metarecords_in_same_project_can_have_same_canonical_slug
+
+    scope :with_canonical_slug, ->(slug) do
+      joins(:slugs).where(wiki_page_slugs: { canonical: true, slug: slug })
+    end
+
+    alias_method :resource_parent, :project
+
+    # Return the (updated) WikiPage::Meta record for a given wiki page
+    #
+    # If none is found, then a new record is created, and its fields are set
+    # to reflect the wiki_page passed.
+    #
+    # @param [String] last_known_slug
+    # @param [WikiPage] wiki_page
+    #
+    # As with all `find_or_create` methods, this one raises errors on
+    # validation issues.
+    def self.find_or_create(last_known_slug, wiki_page)
+      project = wiki_page.wiki.project
+      known_slugs = [last_known_slug, wiki_page.slug].compact.uniq
+      raise 'no slugs!' if known_slugs.empty?
+
+      transaction do
+        found = find_by_canonical_slug(known_slugs, project)
+        meta = found || create(title: wiki_page.title, project_id: project.id)
+
+        meta.update_state(found.nil?, known_slugs, wiki_page)
+
+        # We don't need to run validations here, since find_by_canonical_slug
+        # guarantees that there is no conflict in canonical_slug, and DB
+        # constraints on title and project_id enforce our other invariants
+        # This saves us a query.
+        meta
+      end
+    end
+
+    def self.find_by_canonical_slug(canonical_slug, project)
+      meta, conflict = with_canonical_slug(canonical_slug)
+        .where(project_id: project.id)
+        .limit(2)
+
+      if conflict.present?
+        meta.errors.add(:canonical_slug, 'Duplicate value found')
+        raise CanonicalSlugConflictError.new(meta)
+      end
+
+      meta
+    end
+
+    def canonical_slug
+      strong_memoize(:canonical_slug) { slugs.canonical.first&.slug }
+    end
+
+    def canonical_slug=(slug)
+      return if @canonical_slug == slug
+
+      if persisted?
+        transaction do
+          slugs.canonical.update_all(canonical: false)
+          page_slug = slugs.create_with(canonical: true).find_or_create_by(slug: slug)
+          page_slug.update_columns(canonical: true) unless page_slug.canonical?
+        end
+      else
+        slugs.new(slug: slug, canonical: true)
+      end
+
+      @canonical_slug = slug
+    end
+
+    def update_state(created, known_slugs, wiki_page)
+      update_wiki_page_attributes(wiki_page)
+      insert_slugs(known_slugs, created, wiki_page.slug)
+      self.canonical_slug = wiki_page.slug
+    end
+
+    def update_columns(attrs = {})
+      super(attrs.reverse_merge(updated_at: Time.now.utc))
+    end
+
+    def self.update_all(attrs = {})
+      super(attrs.reverse_merge(updated_at: Time.now.utc))
+    end
+
+    private
+
+    def update_wiki_page_attributes(page)
+      update_columns(title: page.title) unless page.title == title
+    end
+
+    def insert_slugs(strings, is_new, canonical_slug)
+      creation = Time.now.utc
+
+      slug_attrs = strings.map do |slug|
+        {
+          wiki_page_meta_id: id,
+          slug: slug,
+          canonical: (is_new && slug == canonical_slug),
+          created_at: creation,
+          updated_at: creation
+        }
+      end
+      slugs.insert_all(slug_attrs) unless !is_new && slug_attrs.size == 1
+
+      @canonical_slug = canonical_slug if is_new || strings.size == 1
+    end
+
+    def no_two_metarecords_in_same_project_can_have_same_canonical_slug
+      return unless project_id.present? && canonical_slug.present?
+
+      offending = self.class.with_canonical_slug(canonical_slug).where(project_id: project_id)
+      offending = offending.where.not(id: id) if persisted?
+
+      if offending.exists?
+        errors.add(:canonical_slug, 'each page in a wiki must have a distinct canonical slug')
+      end
+    end
+  end
+end

app/models/wiki_page/slug.rb

+# frozen_string_literal: true
+
+class WikiPage
+  class Slug < ApplicationRecord
+    self.table_name = 'wiki_page_slugs'
+
+    belongs_to :wiki_page_meta, class_name: 'WikiPage::Meta', inverse_of: :slugs
+
+    validates :slug, presence: true, uniqueness: { scope: :wiki_page_meta_id }
+    validates :canonical, uniqueness: {
+          scope: :wiki_page_meta_id,
+          if: :canonical?,
+          message: 'Only one slug can be canonical per wiki metadata record'
+    }
+
+    scope :canonical, -> { where(canonical: true) }
+
+    def update_columns(attrs = {})
+      super(attrs.reverse_merge(updated_at: Time.now.utc))
+    end
+
+    def self.update_all(attrs = {})
+      super(attrs.reverse_merge(updated_at: Time.now.utc))
+    end
+  end
+end

app/policies/wiki_page/meta_policy.rb

+# frozen_string_literal: true
+
+class WikiPage::MetaPolicy < BasePolicy
+  delegate { @subject.project }
+end

app/services/metrics/dashboard/clone_dashboard_service.rb

@@ -16,7 +16,7 @@ module Metrics
         def sequences
           @sequences ||= {
             ::Metrics::Dashboard::SystemDashboardService::DASHBOARD_PATH => [::Gitlab::Metrics::Dashboard::Stages::CommonMetricsInserter,
-                                                                             ::Gitlab::Metrics::Dashboard::Stages::ProjectMetricsInserter,
+                                                                             ::Gitlab::Metrics::Dashboard::Stages::CustomMetricsInserter,
                                                                              ::Gitlab::Metrics::Dashboard::Stages::Sorter].freeze
           }.freeze
         end

app/services/metrics/dashboard/self_monitoring_dashboard_service.rb

@@ -9,7 +9,7 @@ module Metrics
       DASHBOARD_NAME = 'Default'
       SEQUENCE = [
-        STAGES::ProjectMetricsInserter,
+        STAGES::CustomMetricsInserter,
         STAGES::EndpointInserter,
         STAGES::Sorter
       ].freeze

app/services/metrics/dashboard/system_dashboard_service.rb

@@ -10,8 +10,8 @@ module Metrics
       SEQUENCE = [
         STAGES::CommonMetricsInserter,
-        STAGES::ProjectMetricsInserter,
-        STAGES::ProjectMetricsDetailsInserter,
+        STAGES::CustomMetricsInserter,
+        STAGES::CustomMetricsDetailsInserter,
         STAGES::EndpointInserter,
         STAGES::Sorter
       ].freeze

changelogs/unreleased/119208-limit-metric-type-on-list-pd.yml

+---
+title: Add limit metric to lists
+merge_request: 25532
+author:
+type: added

changelogs/unreleased/207912-implementing-filtered-search-dropdown-improvement.yml

+---
+title: Improve logs dropdown with more clear labels
+merge_request: 26635
+author:
+type: added

changelogs/unreleased/208234-optimize-ldap-keys-in-usage-data.yml

+---
+title: Optimize ldap keys counters query performance in usage data
+merge_request: 27309
+author:
+type: performance

changelogs/unreleased/30526-a-be-wiki-activity-Models.yml

+---
+title: Adds wiki metadata models
+merge_request: 26529
+author:
+type: added

config/sidekiq_queues.yml

@@ -234,7 +234,7 @@
   - 2
 - - service_desk_email_receiver
   - 1
-- - status_page_publish_incident
+- - status_page_publish
   - 1
 - - sync_seat_link_request
   - 1

db/migrate/20200219135440_add_limit_metric_type_to_list.rb

+# frozen_string_literal: true
+
+class AddLimitMetricTypeToList < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def change
+    add_column :lists, :limit_metric, :string, limit: 20
+  end
+end

db/migrate/20200302152516_add_wiki_slug.rb

+# frozen_string_literal: true
+
+class AddWikiSlug < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def change
+    create_table :wiki_page_meta, id: :serial do |t|
+      t.references :project, index: true, foreign_key: { on_delete: :cascade }, null: false
+      t.timestamps_with_timezone null: false
+      t.string :title, null: false, limit: 255
+    end
+
+    create_table :wiki_page_slugs, id: :serial do |t|
+      t.boolean :canonical, default: false, null: false
+      t.references :wiki_page_meta, index: true, foreign_key: { on_delete: :cascade }, null: false
+      t.timestamps_with_timezone null: false
+      t.string :slug, null: false, limit: 2048
+      t.index [:slug, :wiki_page_meta_id], unique: true
+      t.index [:wiki_page_meta_id], name: 'one_canonical_wiki_page_slug_per_metadata', unique: true, where: "(canonical = true)"
+    end
+  end
+end

db/migrate/20200316111759_add_index_on_id_and_ldap_key_to_keys.rb

+# frozen_string_literal: true
+
+class AddIndexOnIdAndLdapKeyToKeys < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  INDEX_NAME = 'index_keys_on_id_and_ldap_key_type'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :keys, [:id], where: "type = 'LDAPKey'", name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :keys, INDEX_NAME
+  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_13_123934) do
+ActiveRecord::Schema.define(version: 2020_03_16_111759) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_trgm"
@@ -2311,6 +2311,7 @@ ActiveRecord::Schema.define(version: 2020_03_13_123934) do
     t.index ["fingerprint"], name: "index_keys_on_fingerprint", unique: true
     t.index ["fingerprint_sha256"], name: "index_keys_on_fingerprint_sha256"
     t.index ["id", "type"], name: "index_on_deploy_keys_id_and_type_and_public", unique: true, where: "(public = true)"
+    t.index ["id"], name: "index_keys_on_id_and_ldap_key_type", where: "((type)::text = 'LDAPKey'::text)"
     t.index ["last_used_at"], name: "index_keys_on_last_used_at", order: "DESC NULLS LAST"
     t.index ["user_id"], name: "index_keys_on_user_id"
   end
@@ -2425,6 +2426,7 @@ ActiveRecord::Schema.define(version: 2020_03_13_123934) do
     t.integer "milestone_id"
     t.integer "max_issue_count", default: 0, null: false
     t.integer "max_issue_weight", default: 0, null: false
+    t.string "limit_metric", limit: 20
     t.index ["board_id", "label_id"], name: "index_lists_on_board_id_and_label_id", unique: true
     t.index ["label_id"], name: "index_lists_on_label_id"
     t.index ["list_type"], name: "index_lists_on_list_type"
@@ -4668,6 +4670,25 @@ ActiveRecord::Schema.define(version: 2020_03_13_123934) do
     t.index ["type"], name: "index_web_hooks_on_type"
   end
+  create_table "wiki_page_meta", id: :serial, force: :cascade do |t|
+    t.bigint "project_id", null: false
+    t.datetime_with_timezone "created_at", null: false
+    t.datetime_with_timezone "updated_at", null: false
+    t.string "title", limit: 255, null: false
+    t.index ["project_id"], name: "index_wiki_page_meta_on_project_id"
+  end
+
+  create_table "wiki_page_slugs", id: :serial, force: :cascade do |t|
+    t.boolean "canonical", default: false, null: false
+    t.bigint "wiki_page_meta_id", null: false
+    t.datetime_with_timezone "created_at", null: false
+    t.datetime_with_timezone "updated_at", null: false
+    t.string "slug", limit: 2048, null: false
+    t.index ["slug", "wiki_page_meta_id"], name: "index_wiki_page_slugs_on_slug_and_wiki_page_meta_id", unique: true
+    t.index ["wiki_page_meta_id"], name: "index_wiki_page_slugs_on_wiki_page_meta_id"
+    t.index ["wiki_page_meta_id"], name: "one_canonical_wiki_page_slug_per_metadata", unique: true, where: "(canonical = true)"
+  end
+
   create_table "x509_certificates", force: :cascade do |t|
     t.datetime_with_timezone "created_at", null: false
     t.datetime_with_timezone "updated_at", null: false
@@ -5212,6 +5233,8 @@ ActiveRecord::Schema.define(version: 2020_03_13_123934) do
   add_foreign_key "vulnerability_scanners", "projects", on_delete: :cascade
   add_foreign_key "web_hook_logs", "web_hooks", on_delete: :cascade
   add_foreign_key "web_hooks", "projects", name: "fk_0c8ca6d9d1", on_delete: :cascade
+  add_foreign_key "wiki_page_meta", "projects", on_delete: :cascade
+  add_foreign_key "wiki_page_slugs", "wiki_page_meta", column: "wiki_page_meta_id", on_delete: :cascade
   add_foreign_key "x509_certificates", "x509_issuers", on_delete: :cascade
   add_foreign_key "x509_commit_signatures", "projects", on_delete: :cascade
   add_foreign_key "x509_commit_signatures", "x509_certificates", on_delete: :cascade