diff options
| author | http://jneen.net/ <jneen@jneen.net> | 2016-08-08 21:55:13 +0300 |
|---|---|---|
| committer | http://jneen.net/ <jneen@jneen.net> | 2016-08-30 21:35:06 +0300 |
| commit | 5853c96b49010aaf33b85caeb94dfc18873d5656 (patch) | |
| tree | c685956bbc4cb007e72c8548a0b4000df1bc4948 /app/models/merge_request.rb | |
| parent | c218dd90dabb0ddff7fab09abbb348fe1c56201b (diff) | |
remove Ability.abilities
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 62163e74000..57d673a5f25 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -411,7 +411,7 @@ class MergeRequest < ActiveRecord::Base def can_remove_source_branch?(current_user) !source_project.protected_branch?(source_branch) && !source_project.root_ref?(source_branch) && - Ability.abilities.allowed?(current_user, :push_code, source_project) && + Ability.allowed?(current_user, :push_code, source_project) && diff_head_commit == source_branch_head end |