Merge branch 'ph/fixReviewersCanMergeIcon' into 'master'

Fix the merge icon in the reviewers dropdown being incorrect sometimes

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/149426



Merged-by: Kushal Pandya <kushal@gitlab.com>
Approved-by: Kushal Pandya <kushal@gitlab.com>
Co-authored-by: Phil Hughes <me@iamphill.com>

app/assets/javascripts/sidebar/components/reviewers/sidebar_reviewers_inputs.vue

@@ -28,7 +28,7 @@ export default {
       :data-avatar-url="reviewer.avatarUrl"
       :data-name="reviewer.name"
       :data-username="reviewer.username"
-      :data-can-merge="reviewer.mergeRequestInteraction.canMerge"
+      :data-can_merge="reviewer.mergeRequestInteraction.canMerge"
     />
   </div>
 </template>

app/assets/javascripts/users_select/index.js

@@ -296,7 +296,13 @@ function UsersSelect(currentUser, els, options = {}) {
               })
               .map((input) => {
                 const userId = parseInt(input.value, 10);
-                const { avatarUrl, avatar_url, name, username, canMerge } = input.dataset;
+                const {
+                  avatarUrl,
+                  avatar_url,
+                  name,
+                  username,
+                  can_merge: canMerge,
+                } = input.dataset;
                 return {
                   avatar_url: avatarUrl || avatar_url || gon.default_avatar_url,
                   id: userId,