From 5daeb68377414965812b026506cb7fc73bffb48a Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 13 Nov 2023 12:08:40 +0000
Subject: [PATCH] Removes widget_pipeline_pass_subscription_update feature flag
Changelog: added
---
.../components/states/ready_to_merge.vue | 7 +------
.../projects/merge_requests_controller.rb | 1 -
app/models/ci/pipeline.rb | 1 -
.../widget_pipeline_pass_subscription_update.yml | 8 --------
spec/models/ci/pipeline_spec.rb | 12 +-----------
5 files changed, 2 insertions(+), 27 deletions(-)
delete mode 100644 config/feature_flags/development/widget_pipeline_pass_subscription_update.yml
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
index 3c2d8efaffcf5..6de041d8f0d78 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
@@ -59,6 +59,7 @@ export default {
apollo: {
state: {
query: readyToMergeQuery,
+ fetchPolicy: fetchPolicies.NO_CACHE,
variables() {
return this.mergeRequestQueryVariables;
},
@@ -349,12 +350,6 @@ export default {
eventHub.$on('ApprovalUpdated', this.updateGraphqlState);
eventHub.$on('MRWidgetUpdateRequested', this.updateGraphqlState);
eventHub.$on('mr.discussion.updated', this.updateGraphqlState);
-
- if (this.glFeatures.widgetPipelinePassSubscriptionUpdate) {
- this.$apollo.queries.state.setOptions({
- fetchPolicy: fetchPolicies.NO_CACHE,
- });
- }
},
beforeDestroy() {
eventHub.$off('ApprovalUpdated', this.updateGraphqlState);
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index eb7505bd81f29..46725fd0fc3ff 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -45,7 +45,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
push_frontend_feature_flag(:ci_job_failures_in_mr, project)
push_frontend_feature_flag(:mr_pipelines_graphql, project)
push_frontend_feature_flag(:notifications_todos_buttons, current_user)
- push_frontend_feature_flag(:widget_pipeline_pass_subscription_update, project)
push_frontend_feature_flag(:mr_request_changes, current_user)
end
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index cf3efc5998fe1..ca0a53fcf70a0 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -413,7 +413,6 @@ class Pipeline < Ci::ApplicationRecord
pipeline.run_after_commit do
next if pipeline.child?
- next unless Feature.enabled?(:widget_pipeline_pass_subscription_update, project) || project.only_allow_merge_if_pipeline_succeeds?(inherit_group_setting: true)
pipeline.all_merge_requests.opened.each do |merge_request|
GraphqlTriggers.merge_request_merge_status_updated(merge_request)
diff --git a/config/feature_flags/development/widget_pipeline_pass_subscription_update.yml b/config/feature_flags/development/widget_pipeline_pass_subscription_update.yml
deleted file mode 100644
index 764b0a59291ee..0000000000000
--- a/config/feature_flags/development/widget_pipeline_pass_subscription_update.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: widget_pipeline_pass_subscription_update
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132353
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/428633
-milestone: '16.6'
-type: development
-group: group::code review
-default_enabled: false
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 9696ba7b3eefd..61522c1e4dd08 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -2028,17 +2028,7 @@ def auto_devops_pipelines_completed_total(status)
end
end
- context 'when only_allow_merge_if_pipeline_succeeds? returns false and widget_pipeline_pass_subscription_update disabled' do
- let(:only_allow_merge_if_pipeline_succeeds?) { false }
-
- before do
- stub_feature_flags(widget_pipeline_pass_subscription_update: false)
- end
-
- it_behaves_like 'state transition not triggering GraphQL subscription mergeRequestMergeStatusUpdated'
- end
-
- context 'when only_allow_merge_if_pipeline_succeeds? returns false and widget_pipeline_pass_subscription_update enabled' do
+ context 'when only_allow_merge_if_pipeline_succeeds? returns false' do
let(:only_allow_merge_if_pipeline_succeeds?) { false }
it_behaves_like 'triggers GraphQL subscription mergeRequestMergeStatusUpdated' do
--
GitLab