Add latest changes from gitlab-org/gitlab@master

7 files changed, 68 insertions, 24 deletions

diff --git a/lib/gitlab/ci/config/entry/default.rb b/lib/gitlab/ci/config/entry/default.rb
index 12d68b755b3..e996b6b1312 100644
--- a/lib/gitlab/ci/config/entry/default.rb
+++ b/lib/gitlab/ci/config/entry/default.rb
@@ -13,9 +13,8 @@ module Gitlab
           include ::Gitlab::Config::Entry::Configurable
           include ::Gitlab::Config::Entry::Inheritable
 
-          ALLOWED_KEYS = %i[before_script image services
-                            after_script cache interruptible
-                            timeout retry tags artifacts].freeze
+          ALLOWED_KEYS = %i[before_script after_script hooks cache image services
+                            interruptible timeout retry tags artifacts].freeze
 
           validations do
             validates :config, allowed_keys: ALLOWED_KEYS
@@ -25,22 +24,27 @@ module Gitlab
             description: 'Script that will be executed before each job.',
             inherit: true
 
-          entry :image, Entry::Image,
-            description: 'Docker image that will be used to execute jobs.',
-            inherit: true
-
-          entry :services, Entry::Services,
-            description: 'Docker images that will be linked to the container.',
-            inherit: true
-
           entry :after_script, Entry::Commands,
             description: 'Script that will be executed after each job.',
             inherit: true
 
+          entry :hooks, Entry::Hooks,
+            description: 'Commands that will be executed on Runner before/after some events ' \
+                         'such as `clone` and `build-script`.',
+            inherit: false
+
           entry :cache, Entry::Caches,
             description: 'Configure caching between build jobs.',
             inherit: true
 
+          entry :image, Entry::Image,
+            description: 'Docker image that will be used to execute jobs.',
+            inherit: true
+
+          entry :services, Entry::Services,
+            description: 'Docker images that will be linked to the container.',
+            inherit: true
+
           entry :interruptible, ::Gitlab::Config::Entry::Boolean,
             description: 'Set jobs interruptible default value.',
             inherit: false
diff --git a/lib/gitlab/ci/config/entry/hooks.rb b/lib/gitlab/ci/config/entry/hooks.rb
index d979dd497b2..28bc2e4e7ce 100644
--- a/lib/gitlab/ci/config/entry/hooks.rb
+++ b/lib/gitlab/ci/config/entry/hooks.rb
@@ -8,6 +8,8 @@ module Gitlab
           # `Configurable` alreadys adds `Validatable`
           include ::Gitlab::Config::Entry::Configurable
 
+          # NOTE: If a new hook is added, inheriting should be changed because a `job:hooks` overrides all
+          #       `default:hooks` now. We should implement merging; each hook must be overridden individually.
           ALLOWED_HOOKS = %i[pre_get_sources_script].freeze
 
           validations do
diff --git a/lib/gitlab/ci/config/entry/job.rb b/lib/gitlab/ci/config/entry/job.rb
index 29335c4679c..7c49b59a7f0 100644
--- a/lib/gitlab/ci/config/entry/job.rb
+++ b/lib/gitlab/ci/config/entry/job.rb
@@ -61,7 +61,7 @@ module Gitlab
 
           entry :hooks, Entry::Hooks,
             description: 'Commands that will be executed on Runner before/after some events; clone, build-script.',
-            inherit: false # This will be true in next iterations
+            inherit: true
 
           entry :cache, Entry::Caches,
             description: 'Cache definition for this job.',
diff --git a/lib/gitlab/ci/pipeline/logger.rb b/lib/gitlab/ci/pipeline/logger.rb
index 9659cec4889..08e731148c6 100644
--- a/lib/gitlab/ci/pipeline/logger.rb
+++ b/lib/gitlab/ci/pipeline/logger.rb
@@ -53,6 +53,7 @@ module Gitlab
           if once
             observations[operation.to_s] = value
           else
+            observations[operation.to_s] ||= []
             observations[operation.to_s].push(value)
           end
         end
@@ -116,13 +117,12 @@ module Gitlab
         end
 
         def enabled?
-          strong_memoize(:enabled) do
-            ::Feature.enabled?(:ci_pipeline_creation_logger, project, type: :ops)
-          end
+          ::Feature.enabled?(:ci_pipeline_creation_logger, project, type: :ops)
         end
+        strong_memoize_attr :enabled?, :enabled
 
         def observations
-          @observations ||= Hash.new { |hash, key| hash[key] = [] }
+          @observations ||= {}
         end
 
         def observe_sql_counters(operation, start_db_counters, end_db_counters, once: false)
diff --git a/lib/gitlab/database_importers/work_items/hierarchy_restrictions_importer.rb b/lib/gitlab/database_importers/work_items/hierarchy_restrictions_importer.rb
new file mode 100644
index 00000000000..1181c259a5c
--- /dev/null
+++ b/lib/gitlab/database_importers/work_items/hierarchy_restrictions_importer.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module DatabaseImporters
+    module WorkItems
+      module HierarchyRestrictionsImporter
+        def self.upsert_restrictions
+          objective = find_or_create_type(::WorkItems::Type::TYPE_NAMES[:objective])
+          key_result = find_or_create_type(::WorkItems::Type::TYPE_NAMES[:key_result])
+          issue = find_or_create_type(::WorkItems::Type::TYPE_NAMES[:issue])
+          task = find_or_create_type(::WorkItems::Type::TYPE_NAMES[:task])
+          incident = find_or_create_type(::WorkItems::Type::TYPE_NAMES[:incident])
+
+          restrictions = [
+            { parent_type_id: objective.id, child_type_id: objective.id, maximum_depth: 9 },
+            { parent_type_id: objective.id, child_type_id: key_result.id, maximum_depth: 1 },
+            { parent_type_id: issue.id, child_type_id: task.id, maximum_depth: 1 },
+            { parent_type_id: incident.id, child_type_id: task.id, maximum_depth: 1 }
+          ]
+
+          ::WorkItems::HierarchyRestriction.upsert_all(
+            restrictions,
+            unique_by: :index_work_item_hierarchy_restrictions_on_parent_and_child
+          )
+        end
+
+        def self.find_or_create_type(name)
+          type = ::WorkItems::Type.find_by_name_and_namespace_id(name, nil)
+          return type if type
+
+          Gitlab::DatabaseImporters::WorkItems::BaseTypeImporter.upsert_types
+          ::WorkItems::Type.find_by_name_and_namespace_id(name, nil)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/slash_commands/application_help.rb b/lib/gitlab/slash_commands/application_help.rb
index bfdb65a816d..94abc8b4508 100644
--- a/lib/gitlab/slash_commands/application_help.rb
+++ b/lib/gitlab/slash_commands/application_help.rb
@@ -3,6 +3,11 @@
 module Gitlab
   module SlashCommands
     class ApplicationHelp < BaseCommand
+      def initialize(project, params)
+        @project = project
+        @params = params
+      end
+
       def execute
         Gitlab::SlashCommands::Presenters::Help
           .new(project, commands, params)
@@ -16,11 +21,7 @@ module Gitlab
       end
 
       def commands
-        Gitlab::SlashCommands::Command.new(
-          project,
-          chat_name,
-          params
-        ).commands
+        Gitlab::SlashCommands::Command.commands
       end
     end
   end
diff --git a/lib/gitlab/slash_commands/command.rb b/lib/gitlab/slash_commands/command.rb
index 265eda46489..f8b55f1a91d 100644
--- a/lib/gitlab/slash_commands/command.rb
+++ b/lib/gitlab/slash_commands/command.rb
@@ -3,7 +3,7 @@
 module Gitlab
   module SlashCommands
     class Command < BaseCommand
-      def commands
+      def self.commands
         commands = [
           Gitlab::SlashCommands::IssueShow,
           Gitlab::SlashCommands::IssueNew,
@@ -15,7 +15,7 @@ module Gitlab
           Gitlab::SlashCommands::Run
         ]
 
-        if Feature.enabled?(:incident_declare_slash_command, current_user)
+        if Feature.enabled?(:incident_declare_slash_command)
           commands << Gitlab::SlashCommands::IncidentManagement::IncidentNew
         end
 
@@ -50,7 +50,7 @@ module Gitlab
       private
 
       def available_commands
-        commands.keep_if do |klass|
+        self.class.commands.keep_if do |klass|
           klass.available?(project)
         end
       end