From 37e4f5140010d844164664a57b65c2b6c16e4d25 Mon Sep 17 00:00:00 2001 From: Nathan Friend Date: Thu, 22 Aug 2019 14:53:14 -0300 Subject: Rename ATMTWPS to MTWPS (CE) This commit does a find-and-replace from ATMTWPS -> MTWPS. --- app/assets/javascripts/vue_merge_request_widget/constants.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'app/assets/javascripts/vue_merge_request_widget/constants.js') diff --git a/app/assets/javascripts/vue_merge_request_widget/constants.js b/app/assets/javascripts/vue_merge_request_widget/constants.js index 3e65bdf0cb0..6f6d145815e 100644 --- a/app/assets/javascripts/vue_merge_request_widget/constants.js +++ b/app/assets/javascripts/vue_merge_request_widget/constants.js @@ -5,11 +5,7 @@ export const WARNING_MESSAGE_CLASS = 'warning_message'; export const DANGER_MESSAGE_CLASS = 'danger_message'; export const MWPS_MERGE_STRATEGY = 'merge_when_pipeline_succeeds'; -export const ATMTWPS_MERGE_STRATEGY = 'add_to_merge_train_when_pipeline_succeeds'; +export const MTWPS_MERGE_STRATEGY = 'add_to_merge_train_when_pipeline_succeeds'; export const MT_MERGE_STRATEGY = 'merge_train'; -export const AUTO_MERGE_STRATEGIES = [ - MWPS_MERGE_STRATEGY, - ATMTWPS_MERGE_STRATEGY, - MT_MERGE_STRATEGY, -]; +export const AUTO_MERGE_STRATEGIES = [MWPS_MERGE_STRATEGY, MTWPS_MERGE_STRATEGY, MT_MERGE_STRATEGY]; -- cgit v1.2.3