Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
		
							parent
							
								
									3795b229ab
								
							
						
					
					
						commit
						14763e2fc6
					
				|  | @ -3,7 +3,6 @@ import { GlSprintf, GlLink } from '@gitlab/ui'; | |||
| 
 | ||||
| import settingsMixin from 'ee_else_ce/pages/projects/shared/permissions/mixins/settings_pannel_mixin'; | ||||
| import { s__ } from '~/locale'; | ||||
| import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; | ||||
| import projectFeatureSetting from './project_feature_setting.vue'; | ||||
| import projectFeatureToggle from '~/vue_shared/components/toggle_button.vue'; | ||||
| import projectSettingRow from './project_setting_row.vue'; | ||||
|  | @ -26,7 +25,7 @@ export default { | |||
|     GlSprintf, | ||||
|     GlLink, | ||||
|   }, | ||||
|   mixins: [settingsMixin, glFeatureFlagsMixin()], | ||||
|   mixins: [settingsMixin], | ||||
| 
 | ||||
|   props: { | ||||
|     currentSettings: { | ||||
|  | @ -200,10 +199,6 @@ export default { | |||
|         'ProjectSettings|View and edit files in this project. Non-project members will only have read access', | ||||
|       ); | ||||
|     }, | ||||
| 
 | ||||
|     metricsDashboardVisibilitySwitchingAvailable() { | ||||
|       return this.glFeatures.metricsDashboardVisibilitySwitchingAvailable; | ||||
|     }, | ||||
|   }, | ||||
| 
 | ||||
|   watch: { | ||||
|  | @ -480,7 +475,6 @@ export default { | |||
|         /> | ||||
|       </project-setting-row> | ||||
|       <project-setting-row | ||||
|         v-if="metricsDashboardVisibilitySwitchingAvailable" | ||||
|         ref="metrics-visibility-settings" | ||||
|         :label="__('Metrics Dashboard')" | ||||
|         :help-text=" | ||||
|  |  | |||
|  | @ -36,10 +36,6 @@ class ProjectsController < Projects::ApplicationController | |||
| 
 | ||||
|   layout :determine_layout | ||||
| 
 | ||||
|   before_action do | ||||
|     push_frontend_feature_flag(:metrics_dashboard_visibility_switching_available) | ||||
|   end | ||||
| 
 | ||||
|   def index | ||||
|     redirect_to(current_user ? root_path : explore_root_path) | ||||
|   end | ||||
|  |  | |||
|  | @ -0,0 +1,5 @@ | |||
| --- | ||||
| title: Add metric dashboard public visibility toggle | ||||
| merge_request: 29718 | ||||
| author: | ||||
| type: added | ||||
|  | @ -57,9 +57,6 @@ describe('Settings Panel', () => { | |||
| 
 | ||||
|     return mountFn(settingsPanel, { | ||||
|       propsData, | ||||
|       provide: { | ||||
|         glFeatures: { metricsDashboardVisibilitySwitchingAvailable: true }, | ||||
|       }, | ||||
|     }); | ||||
|   }; | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue