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
8aa0f45d
Commit
8aa0f45d
authored
Dec 19, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename maybeDisableAcceptance -> setMergeRequestAcceptanceStatus
parent
2dad2438
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
app/assets/javascripts/merge_request_widget/approvals/approvals_store.js.es6
...pts/merge_request_widget/approvals/approvals_store.js.es6
+4
-4
No files found.
app/assets/javascripts/merge_request_widget/approvals/approvals_store.js.es6
View file @
8aa0f45d
...
...
@@ -40,22 +40,22 @@
fetch() {
return this.api.fetchApprovals()
.then(res => this.assignToRootStore('approvals', res.data))
.then(data => this.
maybeDisableAcceptance
(data.approvalsLeft));
.then(data => this.
setMergeRequestAcceptanceStatus
(data.approvalsLeft));
}
approve() {
return this.api.approveMergeRequest()
.then(res => this.assignToRootStore('approvals', res.data))
.then(data => this.
maybeDisableAcceptance
(data.approvalsLeft));
.then(data => this.
setMergeRequestAcceptanceStatus
(data.approvalsLeft));
}
unapprove() {
return this.api.unapproveMergeRequest()
.then(res => this.assignToRootStore('approvals', res.data))
.then(data => this.
maybeDisableAcceptance
(data.approvalsLeft));
.then(data => this.
setMergeRequestAcceptanceStatus
(data.approvalsLeft));
}
maybeDisableAcceptance
(approvalsLeft) {
setMergeRequestAcceptanceStatus
(approvalsLeft) {
return this.rootStore.assignToData('disableAcceptance', !!approvalsLeft);
}
...
...
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