Tweaks to cache context

lib/api/merge_requests.rb

@@ -207,11 +207,10 @@ module API
           # into the cache context
           options[:cache_context] = proc do |mr|
             [
+              options.values_at(:render_html, :with_labels_details, :skip_merge_status_recheck),
               mr.author.managed_by?(current_user),
-              mr.assignee&.managed_by?(current_user),
               mr.assignees.map { |u| u.managed_by?(current_user) },
-              [mr.metrics&.merged_by, mr.metrics&.latest_closed_by].compact.map { |u| u.managed_by?(current_user) },
-              options.values_at(:render_html, :with_labels_details, :skip_merge_status_recheck)
+              [mr.metrics&.merged_by, mr.metrics&.latest_closed_by].compact.map { |u| u.managed_by?(current_user) }
             ]
           end
 

spec/requests/api/merge_requests_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe API::MergeRequests do
+RSpec.describe API::MergeRequests, :with_clean_rails_cache do
   include ProjectForksHelper
 
   let_it_be(:base_time) { Time.now }