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
f5acfbda
Commit
f5acfbda
authored
Dec 20, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Init Flash error message on approval api errors.
parent
b37588bc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
3 deletions
+12
-3
app/assets/javascripts/merge_request_widget/approvals/approvals_api.js.es6
...ripts/merge_request_widget/approvals/approvals_api.js.es6
+12
-3
No files found.
app/assets/javascripts/merge_request_widget/approvals/approvals_api.js.es6
View file @
f5acfbda
...
...
@@ -14,20 +14,29 @@
}
fetchApprovals() {
const flashErrorMessage = 'An error occured while retrieving approval data for this merge request.';
return Vue.http.get(this.baseEndpoint).catch((err) => {
console.error(`Error fetching approvals. ${err}`);
console.error('Error fetching approvals', err);
return new Flash(flashErrorMessage, 'alert');
});
}
approveMergeRequest() {
const flashErrorMessage = 'An error occured while submitting your approval.';
return Vue.http.post(this.baseEndpoint).catch((err) => {
console.error(`Error approving merge request. ${err}`);
console.error('Error approving merge request', err);
return new Flash(flashErrorMessage, 'alert');
});
}
unapproveMergeRequest() {
const flashErrorMessage = 'An error occured while removing your approval.';
return Vue.http.delete(this.baseEndpoint).catch((err) => {
console.error(`Error unapproving merge request. ${err}`);
console.error('Error unapproving merge request', err);
return new Flash(flashErrorMessage, 'alert');
});
}
}
...
...
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