Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.rubocop_todo/rspec/feature_category.yml

@@ -3188,7 +3188,6 @@ RSpec/FeatureCategory:
     - 'spec/lib/gitlab/ci/variables/collection/item_spec.rb'
     - 'spec/lib/gitlab/ci/variables/collection/sort_spec.rb'
     - 'spec/lib/gitlab/ci/variables/helpers_spec.rb'
-    - 'spec/lib/gitlab/ci/yaml_processor/dag_spec.rb'
     - 'spec/lib/gitlab/ci/yaml_processor/feature_flags_spec.rb'
     - 'spec/lib/gitlab/ci_access_spec.rb'
     - 'spec/lib/gitlab/class_attributes_spec.rb'

app/helpers/graph_helper.rb

@@ -4,12 +4,6 @@ module GraphHelper
   def refs(repo, commit)
     refs = [commit.ref_names(repo).join(' ')]
 
-    # append note count
-    unless Feature.enabled?(:disable_network_graph_notes_count, @project, type: :experiment)
-      notes_count = @graph.notes[commit.id]
-      refs << "[#{pluralize(notes_count, 'note')}]" if notes_count > 0
-    end
-
     refs.join
   end
 

app/models/network/graph.rb

@@ -2,7 +2,7 @@
 
 module Network
   class Graph
-    attr_reader :days, :commits, :map, :notes, :repo
+    attr_reader :days, :commits, :map, :repo
 
     def self.max_count
       @max_count ||= 650
@@ -17,28 +17,10 @@ def initialize(project, ref, commit, filter_ref)
 
       @commits = collect_commits
       @days = index_commits
-      @notes = collect_notes
     end
 
     protected
 
-    def collect_notes
-      return {} if Feature.enabled?(:disable_network_graph_notes_count, @project, type: :experiment)
-
-      h = Hash.new(0)
-
-      @project
-        .notes
-        .where(noteable_type: 'Commit')
-        .group('notes.commit_id')
-        .select('notes.commit_id, count(notes.id) as note_count')
-        .each do |item|
-          h[item.commit_id] = item.note_count.to_i
-        end
-
-      h
-    end
-
     # Get commits from repository
     #
     def collect_commits

app/views/shared/wikis/show.html.haml

@@ -12,8 +12,7 @@
 
   .nav-controls.pb-md-3.pb-lg-0
     = render 'shared/wikis/main_links'
-    - if Feature.enabled?(:print_wiki, current_user)
-      #js-export-actions{ data: { options: { target: '.js-wiki-page-content', title: @page.human_title, stylesheet: [stylesheet_path('application')] }.to_json } }
+    #js-export-actions{ data: { options: { target: '.js-wiki-page-content', title: @page.human_title, stylesheet: [stylesheet_path('application')] }.to_json } }
 
 - if @page.historical?
   = render Pajamas::AlertComponent.new(variant: :warning,

config/feature_flags/development/print_wiki.yml

@@ -63,9 +63,41 @@
         "properties": {
           "instrumentation_class": {
             "const": "TotalCountMetric"
+          },
+          "options": {
+            "type": "object",
+            "properties": {
+              "events": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            },
+            "required": [
+              "events"
+            ],
+            "additionalProperties": false
+          },
+          "events": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "required": [
+                "name"
+              ],
+              "properties": {
+                "name": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            }
           }
         },
         "required": [
+          "events",
+          "options",
           "instrumentation_class"
         ]
       }

config/feature_flags/experiment/disable_network_graph_notes_count.yml

@@ -38,10 +38,46 @@
         "properties": {
           "instrumentation_class": {
             "const": "AggregatedMetric"
+          },
+          "options": {
+            "type": "object",
+            "properties": {
+              "aggregate": {
+                "type": "object",
+                "properties": {
+                  "operator": {
+                    "enum": [
+                      "OR",
+                      "AND"
+                    ]
+                  },
+                  "attribute": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "operator",
+                  "attribute"
+                ],
+                "additionalProperties": false
+              },
+              "events": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            },
+            "required": [
+              "aggregate",
+              "events"
+            ],
+            "additionalProperties": false
           }
         },
         "required": [
-          "instrumentation_class"
+          "instrumentation_class",
+          "options"
         ]
       },
       {

config/metrics/schema/internal_events.json

@@ -15,3 +15,4 @@ swap:
   e\. g\.: for example
   i\.e\.: that is
   i\. e\.: that is
+  via: "Use 'with', 'through', or 'by using' instead."

config/metrics/schema/redis_hll.json

@@ -10,6 +10,7 @@ link: https://docs.gitlab.com/ee/development/documentation/styleguide/word_list.
 level: suggestion
 ignorecase: true
 swap:
+  a number of: "Specify the number or remove the phrase."
   as well as: "Use 'and' instead of 'as well as'."
   note that: "Remove the phrase 'note that'."
   please: "Use 'please' only if we've inconvenienced the user."