Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
86e61771
Commit
86e61771
authored
Aug 22, 2019
by
Nathan Friend
Committed by
Paul Slaughter
Aug 29, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename ATMTWPS to MTWPS (CE)
This commit does a find-and-replace from ATMTWPS -> MTWPS.
parent
5d732acd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
11 deletions
+7
-11
app/assets/javascripts/vue_merge_request_widget/constants.js
app/assets/javascripts/vue_merge_request_widget/constants.js
+2
-6
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
...cripts/vue_merge_request_widget/stores/mr_widget_store.js
+3
-3
spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
...widget/components/states/mr_widget_ready_to_merge_spec.js
+2
-2
No files found.
app/assets/javascripts/vue_merge_request_widget/constants.js
View file @
86e61771
...
...
@@ -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
AT
MTWPS_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
];
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @
86e61771
...
...
@@ -3,7 +3,7 @@ import _ from 'underscore';
import
getStateKey
from
'
ee_else_ce/vue_merge_request_widget/stores/get_state_key
'
;
import
{
stateKey
}
from
'
./state_maps
'
;
import
{
formatDate
}
from
'
../../lib/utils/datetime_utility
'
;
import
{
AT
MTWPS_MERGE_STRATEGY
,
MT_MERGE_STRATEGY
,
MWPS_MERGE_STRATEGY
}
from
'
../constants
'
;
import
{
MTWPS_MERGE_STRATEGY
,
MT_MERGE_STRATEGY
,
MWPS_MERGE_STRATEGY
}
from
'
../constants
'
;
export
default
class
MergeRequestStore
{
constructor
(
data
)
{
...
...
@@ -217,8 +217,8 @@ export default class MergeRequestStore {
}
static
getPreferredAutoMergeStrategy
(
availableAutoMergeStrategies
)
{
if
(
_
.
includes
(
availableAutoMergeStrategies
,
AT
MTWPS_MERGE_STRATEGY
))
{
return
AT
MTWPS_MERGE_STRATEGY
;
if
(
_
.
includes
(
availableAutoMergeStrategies
,
MTWPS_MERGE_STRATEGY
))
{
return
MTWPS_MERGE_STRATEGY
;
}
else
if
(
_
.
includes
(
availableAutoMergeStrategies
,
MT_MERGE_STRATEGY
))
{
return
MT_MERGE_STRATEGY
;
}
else
if
(
_
.
includes
(
availableAutoMergeStrategies
,
MWPS_MERGE_STRATEGY
))
{
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
View file @
86e61771
...
...
@@ -6,7 +6,7 @@ import CommitEdit from '~/vue_merge_request_widget/components/states/commit_edit
import
CommitMessageDropdown
from
'
~/vue_merge_request_widget/components/states/commit_message_dropdown.vue
'
;
import
eventHub
from
'
~/vue_merge_request_widget/event_hub
'
;
import
{
createLocalVue
,
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
MWPS_MERGE_STRATEGY
,
AT
MTWPS_MERGE_STRATEGY
}
from
'
~/vue_merge_request_widget/constants
'
;
import
{
MWPS_MERGE_STRATEGY
,
MTWPS_MERGE_STRATEGY
}
from
'
~/vue_merge_request_widget/constants
'
;
const
commitMessage
=
'
This is the commit message
'
;
const
squashCommitMessage
=
'
This is the squash commit message
'
;
...
...
@@ -164,7 +164,7 @@ describe('ReadyToMerge', () => {
});
it
(
'
returns info class for pending status
'
,
()
=>
{
Vue
.
set
(
vm
.
mr
,
'
availableAutoMergeStrategies
'
,
[
AT
MTWPS_MERGE_STRATEGY
]);
Vue
.
set
(
vm
.
mr
,
'
availableAutoMergeStrategies
'
,
[
MTWPS_MERGE_STRATEGY
]);
expect
(
vm
.
mergeButtonClass
).
toEqual
(
inActionClass
);
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment