diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-04 15:09:14 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-04 15:09:14 +0300 |
commit | 8a9cbfa9c56792d8e338c289eb803fb0ebde2083 (patch) | |
tree | fa5ff83fa919ae9a1c37cd8146b78a4a04c9ab7c /app/assets/javascripts/feature_flags | |
parent | fc7ce8aea5b2eca1aaf510667c79b3e7e72f2f3f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/feature_flags')
-rw-r--r-- | app/assets/javascripts/feature_flags/components/strategies/gitlab_user_list.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/feature_flags/components/strategies/gitlab_user_list.vue b/app/assets/javascripts/feature_flags/components/strategies/gitlab_user_list.vue index 273bd47cfc1..6a57e9a8759 100644 --- a/app/assets/javascripts/feature_flags/components/strategies/gitlab_user_list.vue +++ b/app/assets/javascripts/feature_flags/components/strategies/gitlab_user_list.vue @@ -27,7 +27,7 @@ export default { rolloutUserListLabel: s__('FeatureFlag|User List'), rolloutUserListDescription: s__('FeatureFlag|Select a user list'), rolloutUserListNoListError: s__('FeatureFlag|There are no configured user lists'), - defaultDropdownText: s__('FeatureFlags|Select a user list'), + defaultDropdownText: s__('FeatureFlags|No user list selected'), }, computed: { ...mapGetters(['hasUserLists', 'isLoading', 'hasError', 'userListOptions']), @@ -36,7 +36,7 @@ export default { return this.strategy?.userList?.id ?? ''; }, dropdownText() { - return this.strategy?.userList?.name ?? this.$options.defaultDropdownText; + return this.strategy?.userList?.name ?? this.$options.translations.defaultDropdownText; }, }, mounted() { |