diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-25 12:03:31 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-25 12:03:31 +0000 |
| commit | c1313dc52dd27785208ba991879947678662b2f5 (patch) | |
| tree | bed627f5f4cc1bd052d801bb98b3710701de9f6d /app/helpers/compare_helper.rb | |
| parent | 7afe79fb767086a993f13aa40e6d9ffb2d8bd9ef (diff) | |
| parent | aa0bc52a87e98eed2590ab3a5f95f55eb3968bc0 (diff) | |
| download | gitlab-ce-c1313dc52dd27785208ba991879947678662b2f5.tar.gz | |
Merge branch 'tc-only-mr-button-if-allowed' into 'master'
Only show Merge Request button when user can create a MR
See merge request !8639
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 |