Add latest changes from gitlab-org/gitlab@master

4 files changed, 23 insertions, 27 deletions

diff --git a/app/graphql/resolvers/issues_resolver.rb b/app/graphql/resolvers/issues_resolver.rb
index b50186c5a82..4e71a7a9ead 100644
--- a/app/graphql/resolvers/issues_resolver.rb
+++ b/app/graphql/resolvers/issues_resolver.rb
@@ -11,31 +11,32 @@ module Resolvers
               description: 'The list of IIDs of issues, e.g., [1, 2]'
     argument :state, Types::IssuableStateEnum,
               required: false,
-              description: "Current state of Issue"
+              description: 'Current state of Issue'
     argument :label_name, GraphQL::STRING_TYPE.to_list_type,
               required: false,
-              description: "Labels applied to the Issue"
+              description: 'Labels applied to the Issue'
     argument :created_before, Types::TimeType,
               required: false,
-              description: "Issues created before this date"
+              description: 'Issues created before this date'
     argument :created_after, Types::TimeType,
               required: false,
-              description: "Issues created after this date"
+              description: 'Issues created after this date'
     argument :updated_before, Types::TimeType,
               required: false,
-              description: "Issues updated before this date"
+              description: 'Issues updated before this date'
     argument :updated_after, Types::TimeType,
               required: false,
-              description: "Issues updated after this date"
+              description: 'Issues updated after this date'
     argument :closed_before, Types::TimeType,
               required: false,
-              description: "Issues closed before this date"
+              description: 'Issues closed before this date'
     argument :closed_after, Types::TimeType,
               required: false,
-              description: "Issues closed after this date"
+              description: 'Issues closed after this date'
     argument :search, GraphQL::STRING_TYPE, # rubocop:disable Graphql/Descriptions
               required: false
-    argument :sort, Types::Sort, # rubocop:disable Graphql/Descriptions
+    argument :sort, Types::SortEnum,
+              description: 'Sort issues by this criteria',
               required: false,
               default_value: 'created_desc'
 
diff --git a/app/graphql/types/order.rb b/app/graphql/types/order.rb
deleted file mode 100644
index c5e1cc406b4..00000000000
--- a/app/graphql/types/order.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module Types
-  class Types::Order < Types::BaseEnum
-    value "id", "Created at date"
-    value "updated_at", "Updated at date"
-  end
-end
diff --git a/app/graphql/types/sort.rb b/app/graphql/types/sort.rb
deleted file mode 100644
index 1f756fdab69..00000000000
--- a/app/graphql/types/sort.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module Types
-  class Types::Sort < Types::BaseEnum
-    value "updated_desc", "Updated at descending order"
-    value "updated_asc", "Updated at ascending order"
-    value "created_desc", "Created at descending order"
-    value "created_asc", "Created at ascending order"
-  end
-end
diff --git a/app/graphql/types/sort_enum.rb b/app/graphql/types/sort_enum.rb
new file mode 100644
index 00000000000..3245cb33e0d
--- /dev/null
+++ b/app/graphql/types/sort_enum.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Types
+  class SortEnum < BaseEnum
+    graphql_name 'Sort'
+    description 'Common sort values'
+
+    value 'updated_desc', 'Updated at descending order'
+    value 'updated_asc', 'Updated at ascending order'
+    value 'created_desc', 'Created at descending order'
+    value 'created_asc', 'Created at ascending order'
+  end
+end