Skip to content
Snippets Groups Projects

Fix display of promote to group label

Merged Jan Provaznik requested to merge jp-label-fix into master
All threads resolved!

What does this MR do?

Fix display of promote to group label

Since label presenter is used in label index view, label class check doesn't work as expected because the class is now LabelPresenter.

Also label.subject doesn't work as expected now because Label's model subject method is shadowed by Gitlab's presenter's method which uses subject for referencing the original object.

Instead we use a presenter's method for both checks now.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62200

Does this MR meet the acceptance criteria?

Conformity

Performance and testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team
Edited by Jan Provaznik

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Jan Provaznik
  • mentioned in issue #62217 (closed)

  • Jan Provaznik added 1 commit

    added 1 commit

    • f9a55f93 - Fix display of promote to group label

    Compare with previous version

  • assigned to @godfat

  • Lin Jen-Shin
  • Lin Jen-Shin
  • Lin Jen-Shin
  • I am going to apply the suggestions since they're all minor and regression should be fixed quickly.

  • Lin Jen-Shin added 1 commit

    added 1 commit

    • 52764ec5 - Apply suggestion to spec/helpers/labels_helper_spec.rb

    Compare with previous version

  • Lin Jen-Shin resolved all discussions

    resolved all discussions

  • Lin Jen-Shin added 1 commit

    added 1 commit

    • 58dc21e7 - Apply suggestion to spec/features/projects/labels/user_promotes_label_spec.rb

    Compare with previous version

  • Lin Jen-Shin approved this merge request

    approved this merge request

  • Lin Jen-Shin enabled an automatic merge when the pipeline for 58dc21e7 succeeds

    enabled an automatic merge when the pipeline for 58dc21e7 succeeds

  • @jprovaznik Thanks! Looks good to me, and I applied the suggestions and set merge when pipeline succeeds. Glad that now I can still merge even when I applied the suggestions.

  • Lin Jen-Shin canceled the automatic merge

    canceled the automatic merge

  • merged

  • Lin Jen-Shin mentioned in commit 9c2d0d87

    mentioned in commit 9c2d0d87

  • Lin Jen-Shin added 1 deleted label

    added 1 deleted label

  • mentioned in issue #41311 (closed)

  • Automatically picked into https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28679, will merge into 11-11-stable ready for 11.11.2.

  • Lin Jen-Shin mentioned in commit f5610f59

    mentioned in commit f5610f59

  • GitLab Release Tools Bot removed 1 deleted label

    removed 1 deleted label

  • mentioned in merge request !28679 (merged)

  • mentioned in issue #62801 (closed)

  • Heinrich Lee Yu mentioned in merge request !31038 (merged)

    mentioned in merge request !31038 (merged)

  • Please register or sign in to reply
    Loading