Add latest changes from gitlab-org/gitlab@master

6 files changed, 43 insertions, 22 deletions

diff --git a/app/assets/stylesheets/framework/layout.scss b/app/assets/stylesheets/framework/layout.scss
index 7ec13c3d54c..4ef53c673f6 100644
--- a/app/assets/stylesheets/framework/layout.scss
+++ b/app/assets/stylesheets/framework/layout.scss
@@ -1,6 +1,4 @@
 html {
-  overflow-y: scroll;
-
   &.touch .tooltip {
     display: none !important;
   }
diff --git a/app/finders/packages/terraform_module/packages_finder.rb b/app/finders/packages/terraform_module/packages_finder.rb
new file mode 100644
index 00000000000..bcef8738622
--- /dev/null
+++ b/app/finders/packages/terraform_module/packages_finder.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Packages
+  module TerraformModule
+    class PackagesFinder
+      def initialize(project, params = {})
+        @project = project
+        @params = params
+      end
+
+      def execute
+        return ::Packages::Package.none unless project && params[:package_name]
+
+        packages
+      end
+
+      private
+
+      attr_reader :project, :params
+
+      def packages
+        result = project
+          .packages
+          .with_name(params[:package_name])
+          .terraform_module
+          .installable
+
+        params[:package_version] ? result.with_version(params[:package_version]) : result.has_version.order_version_desc
+      end
+    end
+  end
+end
diff --git a/app/graphql/types/namespace_type.rb b/app/graphql/types/namespace_type.rb
index 85bda507ff7..3420f16213f 100644
--- a/app/graphql/types/namespace_type.rb
+++ b/app/graphql/types/namespace_type.rb
@@ -4,7 +4,7 @@ module Types
   class NamespaceType < BaseObject
     graphql_name 'Namespace'
 
-    authorize :read_namespace_via_membership
+    authorize :read_namespace
 
     field :id, GraphQL::Types::ID, null: false,
                                    description: 'ID of the namespace.'
diff --git a/app/models/work_item.rb b/app/models/work_item.rb
index 77f684e3578..f1d007e8167 100644
--- a/app/models/work_item.rb
+++ b/app/models/work_item.rb
@@ -5,7 +5,7 @@ class WorkItem < Issue
 
   COMMON_QUICK_ACTIONS_COMMANDS = [
     :title, :reopen, :close, :cc, :tableflip, :shrug, :type, :promote_to, :checkin_reminder,
-    :subscribe, :unsubscribe, :confidential, :award
+    :subscribe, :unsubscribe, :confidential, :award, :react
   ].freeze
 
   self.table_name = 'issues'
diff --git a/app/models/work_items/hierarchy_restriction.rb b/app/models/work_items/hierarchy_restriction.rb
index a253447a8db..f74f2f037b1 100644
--- a/app/models/work_items/hierarchy_restriction.rb
+++ b/app/models/work_items/hierarchy_restriction.rb
@@ -7,8 +7,17 @@ module WorkItems
     belongs_to :parent_type, class_name: 'WorkItems::Type'
     belongs_to :child_type, class_name: 'WorkItems::Type'
 
+    after_destroy :clear_parent_type_cache!
+    after_save :clear_parent_type_cache!
+
     validates :parent_type, presence: true
     validates :child_type, presence: true
     validates :child_type, uniqueness: { scope: :parent_type_id }
+
+    private
+
+    def clear_parent_type_cache!
+      parent_type.clear_reactive_cache!
+    end
   end
 end
diff --git a/app/services/pages_domains/obtain_lets_encrypt_certificate_service.rb b/app/services/pages_domains/obtain_lets_encrypt_certificate_service.rb
index c11b019cee5..1733021cbb5 100644
--- a/app/services/pages_domains/obtain_lets_encrypt_certificate_service.rb
+++ b/app/services/pages_domains/obtain_lets_encrypt_certificate_service.rb
@@ -10,9 +10,6 @@ module PagesDomains
     # no particular SLA, usually takes 10-15 seconds
     CERTIFICATE_PROCESSING_DELAY = 1.minute.freeze
 
-    # Maximum domain length for Let's Encrypt
-    MAX_DOMAIN_LENGTH = 64
-
     attr_reader :pages_domain
 
     def initialize(pages_domain)
@@ -20,11 +17,6 @@ module PagesDomains
     end
 
     def execute
-      if pages_domain.domain.bytesize > MAX_DOMAIN_LENGTH
-        log_domain_length_error
-        return
-      end
-
       pages_domain.acme_orders.expired.delete_all
       acme_order = pages_domain.acme_orders.first
 
@@ -67,16 +59,6 @@ module PagesDomains
       NotificationService.new.pages_domain_auto_ssl_failed(pages_domain)
     end
 
-    def log_domain_length_error
-      Gitlab::AppLogger.error(
-        message: "Domain name too long for Let's Encrypt certificate",
-        pages_domain: pages_domain.domain,
-        pages_domain_bytesize: pages_domain.domain.bytesize,
-        max_allowed_bytesize: MAX_DOMAIN_LENGTH,
-        project_id: pages_domain.project_id
-      )
-    end
-
     def log_error(api_order)
       Gitlab::AppLogger.error(
         message: "Failed to obtain Let's Encrypt certificate",