diff options
| author | Baldinof <baldinof@gmail.com> | 2016-03-09 15:25:48 +0100 |
|---|---|---|
| committer | Baldinof <baldinof@gmail.com> | 2016-03-11 21:37:57 +0100 |
| commit | e8c723543cfc4c1d905a5794a2da1bef7689d784 (patch) | |
| tree | f8996687a822d2593527e4400d58d382edadee97 /app/controllers/projects_controller.rb | |
| parent | 29ac9f64ea6d0a9e5a7615a9597c668dd129f5ae (diff) | |
| download | gitlab-ce-e8c723543cfc4c1d905a5794a2da1bef7689d784.tar.gz | |
Close merge requests when removing fork relation
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index aea08ecce3e..a26d11459f0 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -72,7 +72,7 @@ class ProjectsController < ApplicationController def remove_fork return access_denied! unless can?(current_user, :remove_fork_project, @project) - if @project.unlink_fork + if @project.unlink_fork(current_user) flash[:notice] = 'The fork relationship has been removed.' end end |