diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-04-03 20:59:58 +0300 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-04-03 21:19:54 +0300 |
| commit | bf3cc824e4ce6cf49a82210eaaf1cca06f7fd281 (patch) | |
| tree | 04d422fe8b68079ef604348ffe96b1f2b72285ff /app/helpers | |
| parent | b8c7bef5c092152ea85d1840e587cfc04293e1d7 (diff) | |
Moved Project#protected_branch? to ProtectedBranch, similar for tags
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/branches_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/tags_helper.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/branches_helper.rb b/app/helpers/branches_helper.rb index 3fc85dc6b2b..a852b90c57e 100644 --- a/app/helpers/branches_helper.rb +++ b/app/helpers/branches_helper.rb @@ -1,6 +1,6 @@ module BranchesHelper def can_remove_branch?(project, branch_name) - if project.protected_branch? branch_name + if ProtectedBranch.protected?(project, branch_name) false elsif branch_name == project.repository.root_ref false diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb index 6672e3da348..31aaf9e5607 100644 --- a/app/helpers/tags_helper.rb +++ b/app/helpers/tags_helper.rb @@ -23,6 +23,6 @@ module TagsHelper end def protected_tag?(project, tag) - project.protected_tag?(tag.name) + ProtectedTag.protected?(project, tag.name) end end |