2 files changed, 3 insertions, 41 deletions
diff --git a/app/graphql/resolvers/concerns/time_frame_arguments.rb b/app/graphql/resolvers/concerns/time_frame_arguments.rb
index 87b7a96045c..c26898bb2f1 100644
--- a/app/graphql/resolvers/concerns/time_frame_arguments.rb
+++ b/app/graphql/resolvers/concerns/time_frame_arguments.rb
@@ -3,51 +3,15 @@
 module TimeFrameArguments
   extend ActiveSupport::Concern
 
-  OVERLAPPING_TIMEFRAME_DESC = 'List items overlapping a time frame defined by startDate..endDate (if one date is provided, both must be present)'
-
   included do
-    argument :start_date, Types::TimeType,
-             required: false,
-             description: OVERLAPPING_TIMEFRAME_DESC,
-             deprecated: { reason: 'Use timeframe.start', milestone: '13.5' }
-
-    argument :end_date, Types::TimeType,
-             required: false,
-             description: OVERLAPPING_TIMEFRAME_DESC,
-             deprecated: { reason: 'Use timeframe.end', milestone: '13.5' }
-
     argument :timeframe, Types::TimeframeInputType,
              required: false,
              description: 'List items overlapping the given timeframe.'
   end
 
-  # TODO: remove when the start_date and end_date arguments are removed
-  def validate_timeframe_params!(args)
-    return unless %i[start_date end_date timeframe].any? { |k| args[k].present? }
-
-    # the timeframe is passed in as a TimeframeInputType
-    timeframe = args[:timeframe].to_h if args[:timeframe]
-    return if timeframe && %i[start_date end_date].all? { |k| args[k].nil? }
-
-    error_message =
-      if timeframe.present?
-        "startDate and endDate are deprecated in favor of timeframe. Please use only timeframe."
-      elsif args[:start_date].nil? || args[:end_date].nil?
-        "Both startDate and endDate must be present."
-      elsif args[:start_date] > args[:end_date]
-        "startDate is after endDate"
-      end
-
-    if error_message
-      raise Gitlab::Graphql::Errors::ArgumentError, error_message
-    end
-  end
-
   def transform_timeframe_parameters(args)
-    if args[:timeframe]
-      args[:timeframe].to_h.transform_keys { |k| :"#{k}_date" }
-    else
-      args.slice(:start_date, :end_date)
-    end
+    return {} unless args[:timeframe]
+
+    args[:timeframe].to_h.transform_keys { |k| :"#{k}_date" }
   end
 end
diff --git a/app/graphql/resolvers/milestones_resolver.rb b/app/graphql/resolvers/milestones_resolver.rb
index 25ff783b408..563c6594665 100644
--- a/app/graphql/resolvers/milestones_resolver.rb
+++ b/app/graphql/resolvers/milestones_resolver.rb
@@ -40,8 +40,6 @@ module Resolvers
     NON_STABLE_CURSOR_SORTS = %i[expired_last_due_date_asc expired_last_due_date_desc].freeze
 
     def resolve_with_lookahead(**args)
-      validate_timeframe_params!(args)
-
       milestones = apply_lookahead(MilestonesFinder.new(milestones_finder_params(args)).execute)
 
       if non_stable_cursor_sort?(args[:sort])