diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-12 21:47:30 +0300 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-12 21:47:30 +0300 |
| commit | b8401cd0b201ab9caecb60dcc477637e70da4df9 (patch) | |
| tree | e197770a94a39ea4956007503440d13cf0b5434e /app/helpers/commits_helper.rb | |
| parent | b75f9721df6c7f5231a9d19e38ec8f0395957c0d (diff) | |
| parent | 7f01d49b69130343d95d7ec470d69aeb14fb94fe (diff) | |
Merge branch 'master' into bootstrap4
Diffstat (limited to 'app/helpers/commits_helper.rb')
| -rw-r--r-- | app/helpers/commits_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index c02bfea1f4d..4898867236e 100644 --- a/app/helpers/commits_helper.rb +++ b/app/helpers/commits_helper.rb @@ -163,7 +163,7 @@ module CommitsHelper tooltip = "#{action.capitalize} this #{commit.change_type_title(current_user)} in a new merge request" if has_tooltip btn_class = "btn btn-#{btn_class}" unless btn_class.nil? - if can_collaborate_with_project? + if can_collaborate_with_project?(@project) link_to action.capitalize, "#modal-#{action}-commit", 'data-toggle' => 'modal', 'data-container' => 'body', title: (tooltip if has_tooltip), class: "#{btn_class} #{'has-tooltip' if has_tooltip}" elsif can?(current_user, :fork_project, @project) continue_params = { |