Commit f19dc6c5 authored by Clement Ho's avatar Clement Ho

Merge branch '50692-default-prop' into 'master'

Removes disabled rule from settings_panel EE to match the CE version

Closes #7346

See merge request gitlab-org/gitlab-ee!6989
parents 3a068e21 49514a15
<script> <script>
/* eslint-disable vue/require-default-prop */
import projectFeatureSetting from './project_feature_setting.vue'; import projectFeatureSetting from './project_feature_setting.vue';
import projectFeatureToggle from '../../../../../vue_shared/components/toggle_button.vue'; import projectFeatureToggle from '../../../../../vue_shared/components/toggle_button.vue';
import projectSettingRow from './project_setting_row.vue'; import projectSettingRow from './project_setting_row.vue';
...@@ -41,14 +40,17 @@ ...@@ -41,14 +40,17 @@
visibilityHelpPath: { visibilityHelpPath: {
type: String, type: String,
required: false, required: false,
default: '',
}, },
lfsHelpPath: { lfsHelpPath: {
type: String, type: String,
required: false, required: false,
default: '',
}, },
registryHelpPath: { registryHelpPath: {
type: String, type: String,
required: false, required: false,
default: '',
}, },
}, },
......
---
title: Remove differences between CE and EE settings panel component
merge_request:
author:
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment