diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-04 14:56:27 +0100 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-04 14:56:27 +0100 |
commit | ccca73d779ae0e22a86c9586fd52b15a8600b9f3 (patch) | |
tree | 7385d9a2019bfa98affe9bc83c0afd7da2fd730d /app/helpers/compare_helper.rb | |
parent | c252c03401881fd7dbf7fab984285c402eb31d5f (diff) | |
parent | 5f7ebfb9aa023849b8b296bf9cf0f472b886d072 (diff) | |
download | gitlab-ce-ccca73d779ae0e22a86c9586fd52b15a8600b9f3.tar.gz |
Merge branch 'master' into add-sentry-js-again-with-vue
Diffstat (limited to 'app/helpers/compare_helper.rb')
-rw-r--r-- | app/helpers/compare_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/compare_helper.rb b/app/helpers/compare_helper.rb index aa54ee07bdc..2aa0449c46e 100644 --- a/app/helpers/compare_helper.rb +++ b/app/helpers/compare_helper.rb @@ -3,7 +3,7 @@ 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) end |