summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToon Claes <toon@gitlab.com>2017-01-25 11:12:09 +0100
committerToon Claes <toon@gitlab.com>2017-01-25 11:12:09 +0100
commitaa0bc52a87e98eed2590ab3a5f95f55eb3968bc0 (patch)
treec3023b64c1da366581727cd4cb189e8c16591666
parenteaffe8cd7202dfb0e459db484ebd4fe4c9d2e155 (diff)
downloadgitlab-ce-tc-only-mr-button-if-allowed.tar.gz
`can?` already includes the `feature_available?` checktc-only-mr-button-if-allowed
`can?` already includes the `feature_available?` check, so no need to check this again.
-rw-r--r--app/helpers/compare_helper.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/helpers/compare_helper.rb b/app/helpers/compare_helper.rb
index 8fcb82f17d5..2aa0449c46e 100644
--- a/app/helpers/compare_helper.rb
+++ b/app/helpers/compare_helper.rb
@@ -3,7 +3,6 @@ module CompareHelper
from.present? &&
to.present? &&
from != to &&
- project.feature_available?(:merge_requests, current_user) &&
can?(current_user, :create_merge_request, project) &&
project.repository.branch_names.include?(from) &&
project.repository.branch_names.include?(to)