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
5aee04dd
Commit
5aee04dd
authored
May 22, 2017
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Shush eslint.
parent
a25fb529
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
...cripts/vue_merge_request_widget/stores/mr_widget_store.js
+1
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @
5aee04dd
...
@@ -53,7 +53,7 @@ export default class MergeRequestStore {
...
@@ -53,7 +53,7 @@ export default class MergeRequestStore {
this
.
removeWIPPath
=
data
.
remove_wip_path
;
this
.
removeWIPPath
=
data
.
remove_wip_path
;
this
.
sourceBranchRemoved
=
!
data
.
source_branch_exists
;
this
.
sourceBranchRemoved
=
!
data
.
source_branch_exists
;
this
.
shouldRemoveSourceBranch
=
mergeParams
.
should_remove_source_branch
||
this
.
shouldRemoveSourceBranch
=
mergeParams
.
should_remove_source_branch
||
mergeParams
.
force_remove_source_branch
===
"
1
"
||
false
;
mergeParams
.
force_remove_source_branch
===
'
1
'
||
false
;
this
.
onlyAllowMergeIfPipelineSucceeds
=
data
.
only_allow_merge_if_pipeline_succeeds
||
false
;
this
.
onlyAllowMergeIfPipelineSucceeds
=
data
.
only_allow_merge_if_pipeline_succeeds
||
false
;
this
.
mergeWhenPipelineSucceeds
=
data
.
merge_when_pipeline_succeeds
||
false
;
this
.
mergeWhenPipelineSucceeds
=
data
.
merge_when_pipeline_succeeds
||
false
;
this
.
mergePath
=
data
.
merge_path
;
this
.
mergePath
=
data
.
merge_path
;
...
...
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