Commit 48ebd782 authored by Bryce Johnson's avatar Bryce Johnson

Shush eslint.

parent ce43b3a3
/* global Vue */ /* global Vue, Flash */
//= require ./approvals_store //= require ./approvals_store
(() => { (() => {
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
} }
fetchApprovals() { fetchApprovals() {
const flashErrorMessage = 'An error occured while retrieving approval data for this merge request.'; const flashErrorMessage = 'An error occured while retrieving approval data for this merge request.';
return Vue.http.get(this.baseEndpoint).catch((err) => { return Vue.http.get(this.baseEndpoint).catch((err) => {
console.error('Error fetching approvals', err); console.error('Error fetching approvals', err);
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
}, },
showSuggestedApprovers() { showSuggestedApprovers() {
return this.suggestedApprovers && this.suggestedApprovers.length; return this.suggestedApprovers && this.suggestedApprovers.length;
} },
}, },
methods: { methods: {
approveMergeRequest() { approveMergeRequest() {
......
...@@ -5,20 +5,20 @@ $(() => { ...@@ -5,20 +5,20 @@ $(() => {
* temporarily. * temporarily.
* */ * */
$('.accept-mr-form').on('ajax:send', function() { $('.accept-mr-form').on('ajax:send', () => {
$(".accept-mr-form :input").disable(); $('.accept-mr-form :input').disable();
}); });
$('.accept_merge_request').on('click', function() { $('.accept_merge_request').on('click', () => {
$('.js-merge-button').html("<i class='fa fa-spinner fa-spin'></i> Merge in progress"); $('.js-merge-button').html('<i class="fa fa-spinner fa-spin"></i> Merge in progress');
}); });
$('.merge_when_build_succeeds').on('click', function() { $('.merge_when_build_succeeds').on('click', () => {
$("#merge_when_build_succeeds").val("1"); $('#merge_when_build_succeeds').val('1');
}); });
$('.js-merge-dropdown a').on('click', function(e) { $('.js-merge-dropdown a').on('click', (e) => {
e.preventDefault(); e.preventDefault();
$(this).closest("form").submit(); $(this).closest('form').submit();
}); });
}); });
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment