Skip to content

fix teammate name display is in wrong location

username-removed-1382360 requested to merge galen_liu/omnibus-gitlab:fix-teammate-name-display-is-in-wrong-location into master

TeammateNameDisplay should belong to TeamSettings, not ServiceSettings

The output of gitlab-ctl reconfigure as below:

    +        "TeammateNameDisplay" : "nickname_full_name",
    +        "EnableAPIv3" : true,
    +        "GoroutineHealthThreshold" : -1
         },
         "TeamSettings": {
             "SiteName": "GitLab Mattermost",
    @@ -57,68 +47,50 @@
             "EnableUserCreation": true,
             "EnableOpenServer": false,
             "RestrictCreationToDomains": "",
    -        "EnableCustomBrand": false,
    -        "CustomBrandText": "",
    -        "CustomDescriptionText": "",
    +        "RestrictTeamNames": true,
             "RestrictDirectMessage": "any",
    -        "RestrictTeamInvite": "all",
    -        "RestrictPublicChannelManagement": "all",
    -        "RestrictPrivateChannelManagement": "all",
    -        "RestrictPublicChannelCreation": "all",
    -        "RestrictPrivateChannelCreation": "all",
    -        "RestrictPublicChannelDeletion": "all",
    -        "RestrictPrivateChannelDeletion": "all",
    -        "RestrictPrivateChannelManageMembers": "all",
    -        "UserStatusAwayTimeout": 300,
             "MaxChannelsPerTeam": 2000,
    -        "MaxNotificationsPerChannel": 1000,
    -        "TeammateNameDisplay": "nickname_full_name"
    +        "UserStatusAwayTimeout": 300
         },

Merge request reports