From cfdebd5834791b9152dc32af10a63b8db6ddbab9 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Sat, 26 May 2018 14:36:56 +0530 Subject: [PATCH] Fix regression in cve-2017-0920.patch --- debian/patches/cve-2017-0920.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/patches/cve-2017-0920.patch b/debian/patches/cve-2017-0920.patch index 62fe8d08c0..3ca235e5a3 100644 --- a/debian/patches/cve-2017-0920.patch +++ b/debian/patches/cve-2017-0920.patch @@ -35,7 +35,8 @@ See merge request gitlab/gitlabhq!2273 - @project = Project.find(params[:target_project_id]) if params[:target_project_id] + set_projects! - params[:target_project_id] ||= source_project.id +- params[:target_project_id] ||= source_project.id ++ params[:target_project_id] ||= @project.id merge_request = MergeRequest.new - merge_request.source_project = source_project