diff options
| author | Nathan Friend <nathan@gitlab.com> | 2019-08-22 14:53:14 -0300 |
|---|---|---|
| committer | Nathan Friend <nathan@gitlab.com> | 2019-08-22 14:55:55 -0300 |
| commit | 37e4f5140010d844164664a57b65c2b6c16e4d25 (patch) | |
| tree | 4917673b0be3db23f5a73e4dab23b3b73542b75b /app/assets/javascripts/vue_merge_request_widget/constants.js | |
| parent | 8308469fdd031a1f7baa6e95966dfc467eb5df51 (diff) | |
| download | gitlab-ce-37e4f5140010d844164664a57b65c2b6c16e4d25.tar.gz | |
Rename ATMTWPS to MTWPS (CE)ce-13479-rename-atmtwps-to-mtwps
This commit does a find-and-replace from ATMTWPS -> MTWPS.
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/constants.js')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/constants.js | 8 |
1 files changed, 2 insertions, 6 deletions
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]; |