diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-07-24 18:41:55 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-07-24 18:41:55 +0000 |
| commit | 60701f5c52077b4aafd87012a4beb3d6fcc6ad37 (patch) | |
| tree | 98099c8f9dee31e6131edbaea7feeeec345ba6e3 /app | |
| parent | 85a304d2ac8bf52a4d8dd5e3fccd2e3ec6b7d595 (diff) | |
| parent | f5ec6b4e1296475aa4930b504ed2e3d329631fcb (diff) | |
| download | gitlab-ce-60701f5c52077b4aafd87012a4beb3d6fcc6ad37.tar.gz | |
Merge branch '62217-follow-up-from-fix-display-of-promote-to-group-label' into 'master'
Remove project param from `#show_label_issuables_link?`
Closes #62217
See merge request gitlab-org/gitlab-ce!31038
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/labels_helper.rb | 5 | ||||
| -rw-r--r-- | app/views/shared/_label_row.html.haml | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb index db4f29cd996..2ed016beea4 100644 --- a/app/helpers/labels_helper.rb +++ b/app/helpers/labels_helper.rb @@ -4,11 +4,10 @@ module LabelsHelper extend self include ActionView::Helpers::TagHelper - def show_label_issuables_link?(label, issuables_type, current_user: nil, project: nil) + def show_label_issuables_link?(label, issuables_type, current_user: nil) return true unless label.project_label? - return true unless project - project.feature_available?(issuables_type, current_user) + label.project.feature_available?(issuables_type, current_user) end # Link to a Label diff --git a/app/views/shared/_label_row.html.haml b/app/views/shared/_label_row.html.haml index af11ce94ec5..b05d903fabe 100644 --- a/app/views/shared/_label_row.html.haml +++ b/app/views/shared/_label_row.html.haml @@ -1,7 +1,7 @@ - force_priority = local_assigns.fetch(:force_priority, false) - subject_or_group_defined = defined?(@project) || defined?(@group) -- show_label_issues_link = subject_or_group_defined && show_label_issuables_link?(label, :issues, project: @project) -- show_label_merge_requests_link = subject_or_group_defined && show_label_issuables_link?(label, :merge_requests, project: @project) +- show_label_issues_link = subject_or_group_defined && show_label_issuables_link?(label, :issues) +- show_label_merge_requests_link = subject_or_group_defined && show_label_issuables_link?(label, :merge_requests) .label-name = render_label(label, tooltip: false) |