Merge branch 'remove-deploy-from-footer-flag' into 'master'

Remove deploy_from_footer Feature Flag

See merge request gitlab-org/gitlab!43597

app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue

@@ -74,9 +74,6 @@ export default {
     canBeManuallyRedeployed() {
       return this.computedDeploymentStatus === FAILED && Boolean(this.redeployPath);
     },
-    shouldShowManualButtons() {
-      return this.glFeatures.deployFromFooter;
-    },
     hasExternalUrls() {
       return Boolean(this.deployment.external_url && this.deployment.external_url_formatted);
     },
@@ -154,7 +151,7 @@ export default {
 <template>
   <div>
     <deployment-action-button
-      v-if="shouldShowManualButtons && canBeManuallyDeployed"
+      v-if="canBeManuallyDeployed"
       :action-in-progress="actionInProgress"
       :actions-configuration="$options.actionsConfiguration[constants.DEPLOYING]"
       :computed-deployment-status="computedDeploymentStatus"
@@ -165,7 +162,7 @@ export default {
       <span>{{ $options.actionsConfiguration[constants.DEPLOYING].buttonText }}</span>
     </deployment-action-button>
     <deployment-action-button
-      v-if="shouldShowManualButtons && canBeManuallyRedeployed"
+      v-if="canBeManuallyRedeployed"
       :action-in-progress="actionInProgress"
       :actions-configuration="$options.actionsConfiguration[constants.REDEPLOYING]"
       :computed-deployment-status="computedDeploymentStatus"

app/controllers/projects/merge_requests_controller.rb

@@ -27,7 +27,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
   before_action :authenticate_user!, only: [:assign_related_issues]
   before_action :check_user_can_push_to_source_branch!, only: [:rebase]
   before_action only: [:show] do
-    push_frontend_feature_flag(:deploy_from_footer, @project, default_enabled: true)
     push_frontend_feature_flag(:suggest_pipeline) if experiment_enabled?(:suggest_pipeline)
     push_frontend_feature_flag(:widget_visibility_polling, @project, default_enabled: true)
     push_frontend_feature_flag(:merge_ref_head_comments, @project, default_enabled: true)

config/feature_flags/development/deploy_from_footer.yml

----
-name: deploy_from_footer
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/25427
-rollout_issue_url:
-group: group::progressive delivery
-type: development
-default_enabled: true

spec/frontend/vue_mr_widget/deployment/deployment_actions_spec.js

@@ -31,10 +31,7 @@ describe('DeploymentAction component', () => {
       wrapper.destroy();
     }
 
-    wrapper = mount(DeploymentActions, {
-      ...options,
-      provide: { glFeatures: { deployFromFooter: true } },
-    });
+    wrapper = mount(DeploymentActions, options);
   };
 
   const findStopButton = () => wrapper.find('.js-stop-env');

spec/frontend/vue_mr_widget/deployment/deployment_spec.js

@@ -19,10 +19,7 @@ describe('Deployment component', () => {
     if (wrapper && wrapper.destroy) {
       wrapper.destroy();
     }
-    wrapper = mount(DeploymentComponent, {
-      ...options,
-      provide: { glFeatures: { deployFromFooter: true } },
-    });
+    wrapper = mount(DeploymentComponent, options);
   };
 
   beforeEach(() => {