Merge branch 'Fix-GraphQL/OrderedArguments-offense-(Part-4/6)' into 'master'

Fix GraphQL/OrderedArguments offense (Part 4/6)

See merge request gitlab-org/gitlab!76026

.rubocop_todo/graphql/ordered_arguments.yml

@@ -4,10 +4,6 @@ GraphQL/OrderedArguments:
   - app/graphql/resolvers/base_issues_resolver.rb
   - app/graphql/resolvers/design_management/designs_resolver.rb
   - app/graphql/resolvers/design_management/version/design_at_version_resolver.rb
-  - app/graphql/resolvers/merge_requests_resolver.rb
-  - app/graphql/resolvers/paginated_tree_resolver.rb
-  - app/graphql/resolvers/tree_resolver.rb
-  - app/graphql/resolvers/users/groups_resolver.rb
   - app/graphql/types/commit_action_type.rb
   - app/graphql/types/diff_paths_input_type.rb
   - app/graphql/types/issues/negated_issue_filter_input_type.rb

app/graphql/resolvers/merge_requests_resolver.rb

@@ -55,6 +55,13 @@ module Resolvers
              required: false,
              description: 'Limit result to draft merge requests.'
 
+    argument :created_after, Types::TimeType,
+             required: false,
+             description: 'Merge requests created after this timestamp.'
+    argument :created_before, Types::TimeType,
+             required: false,
+             description: 'Merge requests created before this timestamp.'
+
     argument :labels, [GraphQL::Types::String],
              required: false,
              as: :label_name,
@@ -72,12 +79,6 @@ module Resolvers
              description: 'Sort merge requests by this criteria.',
              required: false,
              default_value: :created_desc
-    argument :created_after, Types::TimeType,
-             required: false,
-             description: 'Merge requests created after this timestamp.'
-    argument :created_before, Types::TimeType,
-             required: false,
-             description: 'Merge requests created before this timestamp.'
 
     negated do
       argument :labels, [GraphQL::Types::String],

app/graphql/resolvers/paginated_tree_resolver.rb

@@ -11,14 +11,14 @@ module Resolvers
               required: false,
               default_value: '', # root of the repository
               description: 'Path to get the tree for. Default value is the root of the repository.'
-    argument :ref, GraphQL::Types::String,
-              required: false,
-              default_value: :head,
-              description: 'Commit ref to get the tree for. Default value is HEAD.'
     argument :recursive, GraphQL::Types::Boolean,
               required: false,
               default_value: false,
               description: 'Used to get a recursive tree. Default is false.'
+    argument :ref, GraphQL::Types::String,
+              required: false,
+              default_value: :head,
+              description: 'Commit ref to get the tree for. Default value is HEAD.'
 
     alias_method :repository, :object
 

app/graphql/resolvers/tree_resolver.rb

@@ -10,14 +10,14 @@ module Resolvers
               required: false,
               default_value: '',
               description: 'Path to get the tree for. Default value is the root of the repository.'
-    argument :ref, GraphQL::Types::String,
-              required: false,
-              default_value: :head,
-              description: 'Commit ref to get the tree for. Default value is HEAD.'
     argument :recursive, GraphQL::Types::Boolean,
               required: false,
               default_value: false,
               description: 'Used to get a recursive tree. Default is false.'
+    argument :ref, GraphQL::Types::String,
+              required: false,
+              default_value: :head,
+              description: 'Commit ref to get the tree for. Default value is HEAD.'
 
     alias_method :repository, :object
 

app/graphql/resolvers/users/groups_resolver.rb

@@ -11,13 +11,13 @@ module Resolvers
       authorize :read_user_groups
       authorizes_object!
 
-      argument :search, GraphQL::Types::String,
-               required: false,
-               description: 'Search by group name or path.'
       argument :permission_scope,
                ::Types::PermissionTypes::GroupEnum,
                required: false,
                description: 'Filter by permissions the user has on groups.'
+      argument :search, GraphQL::Types::String,
+               required: false,
+               description: 'Search by group name or path.'
 
       before_connection_authorization do |nodes, current_user|
         Preloaders::GroupPolicyPreloader.new(nodes, current_user).execute