diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-05-28 10:05:20 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-06-03 13:08:38 +0000 |
| commit | f5610f598a14e6ffec56a9d67741c98637de7a96 (patch) | |
| tree | 58975f1d9cc92ee83a2758af5d1aa04cee600676 /app/presenters/label_presenter.rb | |
| parent | 672941edde8c8a0ddea1a268bbc741ee16cf11df (diff) | |
| download | gitlab-ce-f5610f598a14e6ffec56a9d67741c98637de7a96.tar.gz | |
Merge branch 'jp-label-fix' into 'master'
Fix display of promote to group label
Closes #62200
See merge request gitlab-org/gitlab-ce!28637
(cherry picked from commit 9c2d0d87581f34567e33de1b384f1f360edcd4b7)
f9a55f93 Fix display of promote to group label
52764ec5 Apply suggestion to spec/helpers/labels_helper_spec.rb
58dc21e7 Apply suggestion to spec/features/projects/labels/user_promotes_label_spec.rb
Diffstat (limited to 'app/presenters/label_presenter.rb')
| -rw-r--r-- | app/presenters/label_presenter.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/presenters/label_presenter.rb b/app/presenters/label_presenter.rb index 5227ef353c3..1077bf543d9 100644 --- a/app/presenters/label_presenter.rb +++ b/app/presenters/label_presenter.rb @@ -35,6 +35,14 @@ class LabelPresenter < Gitlab::View::Presenter::Delegated issuable_subject.is_a?(Project) && label.is_a?(GroupLabel) end + def project_label? + label.is_a?(ProjectLabel) + end + + def subject_name + label.subject.name + end + private def context_subject |