Merge branch '3142-fix-merge-request-approvals-validation-error' into 'master'

fix the approvals_before_merge project fallback

Closes #3142

See merge request gitlab-org/gitlab-ee!2932

changelogs/unreleased-ee/3142-fix-merge-request-approvals-validation-error.yml

+---
+title: Fix a merge request validation error on forked projects.
+merge_request: 2932
+author:
+type: fixed

ee/app/controllers/ee/projects/merge_requests/application_controller.rb

@@ -36,8 +36,15 @@ module EE
         def clamp_approvals_before_merge(mr_params)
           return mr_params unless mr_params[:approvals_before_merge]
 
-          target_project = @project.forked_from_project if @project.id.to_s != mr_params[:target_project_id]
-          target_project ||= @project
+          # Target the MR target project in priority, else it depends whether the project
+          # is forked.
+          target_project = if @merge_request
+                             @merge_request.target_project
+                           elsif @project.forked? && @project.id.to_s != mr_params[:target_project_id]
+                             @project.forked_from_project
+                           else
+                             @project
+                           end
 
           if mr_params[:approvals_before_merge].to_i <= target_project.approvals_before_merge
             mr_params[:approvals_before_merge] = nil