Commit e8924458 authored by Mike Greiling's avatar Mike Greiling

Merge branch 'cleanup-pipeline-status-feature-flag' into 'master'

Clean up feature flag for pipeline status in pipeline editor [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!60463
parents 4e654437 79522680
<script> <script>
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import PipelineStatus from './pipeline_status.vue'; import PipelineStatus from './pipeline_status.vue';
import ValidationSegment from './validation_segment.vue'; import ValidationSegment from './validation_segment.vue';
...@@ -29,7 +28,6 @@ export default { ...@@ -29,7 +28,6 @@ export default {
PipelineStatus, PipelineStatus,
ValidationSegment, ValidationSegment,
}, },
mixins: [glFeatureFlagsMixin()],
props: { props: {
ciConfigData: { ciConfigData: {
type: Object, type: Object,
...@@ -42,7 +40,7 @@ export default { ...@@ -42,7 +40,7 @@ export default {
}, },
computed: { computed: {
showPipelineStatus() { showPipelineStatus() {
return this.glFeatures.pipelineStatusForPipelineEditor && !this.isNewCiConfigFile; return !this.isNewCiConfigFile;
}, },
// make sure corners are rounded correctly depending on if // make sure corners are rounded correctly depending on if
// pipeline status is rendered // pipeline status is rendered
......
...@@ -4,7 +4,6 @@ class Projects::Ci::PipelineEditorController < Projects::ApplicationController ...@@ -4,7 +4,6 @@ class Projects::Ci::PipelineEditorController < Projects::ApplicationController
before_action :check_can_collaborate! before_action :check_can_collaborate!
before_action do before_action do
push_frontend_feature_flag(:ci_config_merged_tab, @project, default_enabled: :yaml) push_frontend_feature_flag(:ci_config_merged_tab, @project, default_enabled: :yaml)
push_frontend_feature_flag(:pipeline_status_for_pipeline_editor, @project, default_enabled: :yaml)
push_frontend_feature_flag(:pipeline_editor_empty_state_action, @project, default_enabled: :yaml) push_frontend_feature_flag(:pipeline_editor_empty_state_action, @project, default_enabled: :yaml)
push_frontend_feature_flag(:pipeline_editor_branch_switcher, @project, default_enabled: :yaml) push_frontend_feature_flag(:pipeline_editor_branch_switcher, @project, default_enabled: :yaml)
end end
......
---
title: Remove feature flag for pipeline status in pipeline editor
merge_request: 60463
author:
type: other
---
name: pipeline_status_for_pipeline_editor
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53797
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321518
milestone: '13.10'
type: development
group: group::pipeline authoring
default_enabled: true
...@@ -7,16 +7,10 @@ import { mockCiYml, mockLintResponse } from '../../mock_data'; ...@@ -7,16 +7,10 @@ import { mockCiYml, mockLintResponse } from '../../mock_data';
describe('Pipeline editor header', () => { describe('Pipeline editor header', () => {
let wrapper; let wrapper;
const mockProvide = {
glFeatures: {
pipelineStatusForPipelineEditor: true,
},
};
const createComponent = ({ provide = {}, props = {} } = {}) => { const createComponent = ({ provide = {}, props = {} } = {}) => {
wrapper = shallowMount(PipelineEditorHeader, { wrapper = shallowMount(PipelineEditorHeader, {
provide: { provide: {
...mockProvide,
...provide, ...provide,
}, },
propsData: { propsData: {
...@@ -56,18 +50,4 @@ describe('Pipeline editor header', () => { ...@@ -56,18 +50,4 @@ describe('Pipeline editor header', () => {
expect(findValidationSegment().exists()).toBe(true); expect(findValidationSegment().exists()).toBe(true);
}); });
}); });
describe('with pipeline status feature flag off', () => {
beforeEach(() => {
createComponent({
provide: {
glFeatures: { pipelineStatusForPipelineEditor: false },
},
});
});
it('does not render the pipeline status', () => {
expect(findPipelineStatus().exists()).toBe(false);
});
});
}); });
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