diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-20 09:48:43 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-20 09:48:43 +0200 |
| commit | 1231a3678aac1c614b19b92f8b2afb397feae959 (patch) | |
| tree | 24502ffe78a93314f5e9820690dbf22df05e37a8 /app/controllers/projects | |
| parent | 8bcb2ff27e79753a84c1800e453584d3a23fbb4e (diff) | |
| download | gitlab-ce-1231a3678aac1c614b19b92f8b2afb397feae959.tar.gz | |
Dont allow change of MR target or source projects after it was created
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 6d39673194a..d644026b2b2 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -94,6 +94,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController return end + # We dont allow change of source/target projects + # after merge request was created + params[:merge_request].delete(:source_project_id) + params[:merge_request].delete(:target_project_id) + if @merge_request.update_attributes(params[:merge_request].merge(author_id_of_changes: current_user.id)) @merge_request.reload_code @merge_request.mark_as_unchecked |