Display badge if a user is a GitLab employee
What does this MR do?
See #207118 (closed)
backend counterpart issue and MR: #209327 (closed) !26836 (merged)
For users with a @gitlab.com
email address (See !26836 (merged) for how this is being determined):
- Adds a GitLab employee badge to comments on issues and merge requests
- On edit profile page it changes "Organization" field to
readonly
and pre-populates with "GitLab"
Local Testing
- Enable
:gitlab_employee_badge
feature flag.bin/rails console
Feature.enable(:gitlab_employee_badge)
- In
lib/gitlab.rb
changeself.com?
to returntrue
- Create a user with a
@gitlab.com
email address - Navigate to
/profile
,Organization
field should bereadonly
- Create a comment on a Issue/MR/Epic. A badge will appear next to your username. Note The backend endpoint is currently not working on the
master
branch. There was a mixup and the/discussions
endpoint was updated instead of/discussions.json
. You can temporarily merge in thefix-gitlab-employee-attribute
branch to test this feature.
Feature Flag
This MR is behind the :gitlab_employee_badge
feature flag. Flag is used in app/views/profiles/show.html.haml
. It is not needed in app/assets/javascripts/notes/components/note_header.vue
as the badge is not shown if author.is_gitlab_employee
is undefined
(which it will be when the feature flag is turned off).
Screenshots
Expand
Page | Before | After |
---|---|---|
Edit Profile | ![]() |
![]() |
Issue Comment | ![]() |
![]() |
Issue Comment Mobile | ![]() |
![]() |
MR Comment | ![]() |
![]() |
MR Comment Mobile | ![]() |
![]() |
Does this MR meet the acceptance criteria?
Conformity
-
Changelog entry - [-] Documentation (if required)
-
Code review guidelines -
Merge request performance guidelines -
Style guides - [-] Database guides
- [-] Separation of EE specific content
Availability and Testing
-
Review and add/update tests for this feature/bug. Consider all test levels. See the Test Planning Process. -
Tested in all supported browsers - [-] Informed Infrastructure department of a default or new setting change, if applicable per definition of done
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 Peter Hegman