Add latest changes from gitlab-org/gitlab@13-4-stable-ee

6 files changed, 110 insertions, 46 deletions

diff --git a/lib/gitlab/graphql/docs/helper.rb b/lib/gitlab/graphql/docs/helper.rb
index 0dd28b32511..dcd0e12cbfc 100644
--- a/lib/gitlab/graphql/docs/helper.rb
+++ b/lib/gitlab/graphql/docs/helper.rb
@@ -21,30 +21,47 @@ module Gitlab
           MD
         end
 
-        def sorted_fields(fields)
-          fields.sort_by { |field| field[:name] }
+        def render_name_and_description(object)
+          content = "### #{object[:name]}\n"
+
+          if object[:description].present?
+            content += "\n#{object[:description]}.\n"
+          end
+
+          content
+        end
+
+        def sorted_by_name(objects)
+          objects.sort_by { |o| o[:name] }
         end
 
         def render_field(field)
           '| %s | %s | %s |' % [
-            render_field_name(field),
+            render_name(field),
             render_field_type(field[:type][:info]),
-            render_field_description(field)
+            render_description(field)
             ]
         end
 
-        def render_field_name(field)
-          rendered_name = "`#{field[:name]}`"
-          rendered_name += ' **{warning-solid}**' if field[:is_deprecated]
+        def render_enum_value(value)
+          '| %s | %s |' % [
+            render_name(value),
+            render_description(value)
+            ]
+        end
+
+        def render_name(object)
+          rendered_name = "`#{object[:name]}`"
+          rendered_name += ' **{warning-solid}**' if object[:is_deprecated]
           rendered_name
         end
 
-        # Returns the field description. If the field has been deprecated,
+        # Returns the object description. If the object has been deprecated,
         # the deprecation reason will be returned in place of the description.
-        def render_field_description(field)
-          return field[:description] unless field[:is_deprecated]
+        def render_description(object)
+          return object[:description] unless object[:is_deprecated]
 
-          "**Deprecated:** #{field[:deprecation_reason]}"
+          "**Deprecated:** #{object[:deprecation_reason]}"
         end
 
         # Some fields types are arrays of other types and are displayed
@@ -70,6 +87,13 @@ module Gitlab
               !object_type[:name]["__"]
           end
         end
+
+        # We ignore the built-in enum types.
+        def enums
+          graphql_enum_types.select do |enum_type|
+            !enum_type[:name].in?(%w(__DirectiveLocation __TypeKind))
+          end
+        end
       end
     end
   end
diff --git a/lib/gitlab/graphql/docs/templates/default.md.haml b/lib/gitlab/graphql/docs/templates/default.md.haml
index 8c033526557..ec052943589 100644
--- a/lib/gitlab/graphql/docs/templates/default.md.haml
+++ b/lib/gitlab/graphql/docs/templates/default.md.haml
@@ -15,15 +15,45 @@
   CAUTION: **Caution:**
   Fields that are deprecated are marked with **{warning-solid}**.
 \
+
+:plain
+  ## Object types
+
+  Object types represent the resources that GitLab's GraphQL API can return.
+  They contain _fields_. Each field has its own type, which will either be one of the
+  basic GraphQL [scalar types](https://graphql.org/learn/schema/#scalar-types)
+  (e.g.: `String` or `Boolean`) or other object types.
+
+  For more information, see
+  [Object Types and Fields](https://graphql.org/learn/schema/#object-types-and-fields)
+  on `graphql.org`.
+\
+
 - objects.each do |type|
   - unless type[:fields].empty?
-    = "## #{type[:name]}"
-    - if type[:description]&.present?
-      \
-      = type[:description]
-    \
-    ~ "| Name  | Type  | Description |"
-    ~ "| ---   |  ---- | ----------  |"
-    - sorted_fields(type[:fields]).each do |field|
+    = render_name_and_description(type)
+    ~ "| Field | Type | Description |"
+    ~ "| ----- | ---- | ----------- |"
+    - sorted_by_name(type[:fields]).each do |field|
       = render_field(field)
     \
+
+:plain
+  ## Enumeration types
+
+  Also called _Enums_, enumeration types are a special kind of scalar that
+  is restricted to a particular set of allowed values.
+
+  For more information, see
+  [Enumeration Types](https://graphql.org/learn/schema/#enumeration-types)
+  on `graphql.org`.
+\
+
+- enums.each do |enum|
+  - unless enum[:values].empty?
+    = render_name_and_description(enum)
+    ~ "| Value | Description |"
+    ~ "| ----- | ----------- |"
+    - sorted_by_name(enum[:values]).each do |value|
+      = render_enum_value(value)
+    \
diff --git a/lib/gitlab/graphql/loaders/issuable_loader.rb b/lib/gitlab/graphql/loaders/issuable_loader.rb
index 1cc0fbe215f..8ac4be2b661 100644
--- a/lib/gitlab/graphql/loaders/issuable_loader.rb
+++ b/lib/gitlab/graphql/loaders/issuable_loader.rb
@@ -15,6 +15,7 @@ module Gitlab
 
         def batching_find_all(&with_query)
           if issuable_finder.params.keys == ['iids']
+            issuable_finder.parent = parent
             batch_load_issuables(issuable_finder.params[:iids], with_query)
           else
             post_process(find_all, with_query)
@@ -22,24 +23,12 @@ module Gitlab
         end
 
         def find_all
-          issuable_finder.params[parent_param] = parent if parent
-
+          issuable_finder.parent_param = parent if parent
           issuable_finder.execute
         end
 
         private
 
-        def parent_param
-          case parent
-          when Project
-            :project_id
-          when Group
-            :group_id
-          else
-            raise "Unexpected parent: #{parent.class}"
-          end
-        end
-
         def post_process(query, with_query)
           if with_query
             with_query.call(query)
@@ -56,7 +45,7 @@ module Gitlab
           return if parent.nil?
 
           BatchLoader::GraphQL
-            .for([parent_param, iid.to_s])
+            .for([issuable_finder.parent_param, iid.to_s])
             .batch(key: batch_key) do |params, loader, args|
               batch_key = args[:key]
               user = batch_key.current_user
diff --git a/lib/gitlab/graphql/pagination/keyset/conditions/base_condition.rb b/lib/gitlab/graphql/pagination/keyset/conditions/base_condition.rb
index afea7c602be..bd785880b57 100644
--- a/lib/gitlab/graphql/pagination/keyset/conditions/base_condition.rb
+++ b/lib/gitlab/graphql/pagination/keyset/conditions/base_condition.rb
@@ -29,7 +29,10 @@ module Gitlab
             def table_condition(order_info, value, operator)
               if order_info.named_function
                 target = order_info.named_function
-                value  = value&.downcase if target&.name&.downcase == 'lower'
+
+                if target.try(:name)&.casecmp('lower') == 0
+                  value = value&.downcase
+                end
               else
                 target = arel_table[order_info.attribute_name]
               end
diff --git a/lib/gitlab/graphql/pagination/keyset/order_info.rb b/lib/gitlab/graphql/pagination/keyset/order_info.rb
index 12bcc4993b5..f54695ddb9a 100644
--- a/lib/gitlab/graphql/pagination/keyset/order_info.rb
+++ b/lib/gitlab/graphql/pagination/keyset/order_info.rb
@@ -71,25 +71,43 @@ module Gitlab
           def extract_nulls_last_order(order_value)
             tokens = order_value.downcase.split
 
-            [tokens.first, (tokens[1] == 'asc' ? :asc : :desc), nil]
+            column_reference = tokens.first
+            sort_direction = tokens[1] == 'asc' ? :asc : :desc
+
+            # Handles the case when the order value is coming from another table.
+            # Example: table_name.column_name
+            # Query the value using the fully qualified column name: pass table_name.column_name as the named_function
+            if fully_qualified_column_reference?(column_reference)
+              [column_reference, sort_direction, Arel.sql(column_reference)]
+            else
+              [column_reference, sort_direction, nil]
+            end
+          end
+
+          # Example: table_name.column_name
+          def fully_qualified_column_reference?(attribute)
+            attribute.to_s.count('.') == 1
           end
 
           def extract_attribute_values(order_value)
-            named = nil
-            name  = if ordering_by_lower?(order_value)
-                      named = order_value.expr
-                      named.expressions[0].name.to_s
-                    else
-                      order_value.expr.name
-                    end
-
-            [name, order_value.direction, named]
+            if ordering_by_lower?(order_value)
+              [order_value.expr.expressions[0].name.to_s, order_value.direction, order_value.expr]
+            elsif ordering_by_similarity?(order_value)
+              ['similarity', order_value.direction, order_value.expr]
+            else
+              [order_value.expr.name, order_value.direction, nil]
+            end
           end
 
           # determine if ordering using LOWER, eg. "ORDER BY LOWER(boards.name)"
           def ordering_by_lower?(order_value)
             order_value.expr.is_a?(Arel::Nodes::NamedFunction) && order_value.expr&.name&.downcase == 'lower'
           end
+
+          # determine if ordering using SIMILARITY scoring based on Gitlab::Database::SimilarityScore
+          def ordering_by_similarity?(order_value)
+            order_value.to_sql.match?(/SIMILARITY\(.+\*/)
+          end
         end
       end
     end
diff --git a/lib/gitlab/graphql/representation/submodule_tree_entry.rb b/lib/gitlab/graphql/representation/submodule_tree_entry.rb
index 8d17cb9eecc..aa5e74cc837 100644
--- a/lib/gitlab/graphql/representation/submodule_tree_entry.rb
+++ b/lib/gitlab/graphql/representation/submodule_tree_entry.rb
@@ -24,11 +24,11 @@ module Gitlab
         end
 
         def web_url
-          @submodule_links.first
+          @submodule_links&.web
         end
 
         def tree_url
-          @submodule_links.last
+          @submodule_links&.tree
         end
       end
     end