diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/models/ability.rb | 3 | ||||
-rw-r--r-- | app/services/issues/move_service.rb | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index fe9e0aab717..5dff01a4e5d 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -222,7 +222,8 @@ class Ability :admin_wiki, :admin_project, :admin_commit_status, - :admin_build + :admin_build, + :move_issue ] end diff --git a/app/services/issues/move_service.rb b/app/services/issues/move_service.rb index 2cba6147429..8a39e2d5f4d 100644 --- a/app/services/issues/move_service.rb +++ b/app/services/issues/move_service.rb @@ -34,17 +34,14 @@ module Issues end def move? - return false unless @project_new - return false unless @issue_new - return false unless can_move? - - true + @project_new && can_move? end private def can_move? - true + can?(@current_user, :move_issue, @project_old) && + can?(@current_user, :move_issue, @project_new) end def open_new_issue |