diff options
| author | Greg Myers <gmyers@gitlab.com> | 2019-08-27 15:51:04 +0000 |
|---|---|---|
| committer | Greg Myers <gmyers@gitlab.com> | 2019-08-27 15:51:04 +0000 |
| commit | 51a0166af2c532aa7a0d04bb503b43499be97033 (patch) | |
| tree | 9ebd74e8518d573fe4860763ddb41146dab1f453 /app/assets/javascripts/pages/projects/shared/permissions/components/project_feature_setting.vue | |
| parent | f706677357fcdf9cd870d098379788543ea71058 (diff) | |
| parent | 27c222d16ccb666878c7ac558f484efa56f77f37 (diff) | |
| download | gitlab-ce-51a0166af2c532aa7a0d04bb503b43499be97033.tar.gz | |
Merge branch 'master' into 'api-curl-quote-url-docs'api-curl-quote-url-docs
# Conflicts:
# doc/api/events.md
Diffstat (limited to 'app/assets/javascripts/pages/projects/shared/permissions/components/project_feature_setting.vue')
| -rw-r--r-- | app/assets/javascripts/pages/projects/shared/permissions/components/project_feature_setting.vue | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/pages/projects/shared/permissions/components/project_feature_setting.vue b/app/assets/javascripts/pages/projects/shared/permissions/components/project_feature_setting.vue index ff6dadeff7d..533065b2d4d 100644 --- a/app/assets/javascripts/pages/projects/shared/permissions/components/project_feature_setting.vue +++ b/app/assets/javascripts/pages/projects/shared/permissions/components/project_feature_setting.vue @@ -1,5 +1,6 @@ <script> -import projectFeatureToggle from '../../../../../vue_shared/components/toggle_button.vue'; +import projectFeatureToggle from '~/vue_shared/components/toggle_button.vue'; +import { featureAccessLevelNone } from '../constants'; export default { components: { @@ -43,7 +44,7 @@ export default { if (this.featureEnabled) { return this.options; } - return [[0, 'Enable feature to choose access level']]; + return [featureAccessLevelNone]; }, displaySelectInput() { |