summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.vue
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2018-10-29 10:09:53 +1100
committerSimon Knox <psimyn@gmail.com>2018-10-29 10:09:53 +1100
commit8783eb33a01549403eb90769f6e45ef33caa374d (patch)
treec5b612a13cb42e496d5ebd8ee55ab32bb5be8053 /app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.vue
parent67f28ccdd85fa6c80e52dd5799c10893e6d9e0a8 (diff)
parent04184b32ec77c073757218f02f2796a24e88b79b (diff)
downloadgitlab-ce-8783eb33a01549403eb90769f6e45ef33caa374d.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into backport-ee-7203-sticky-logs-topbarbackport-ee-7203-sticky-logs-topbar
Diffstat (limited to 'app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.vue')
-rw-r--r--app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.vue6
1 files changed, 2 insertions, 4 deletions
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.vue b/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.vue
index 8660b0546cf..8e8b9f19b6e 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.vue
@@ -26,7 +26,7 @@ export default {
methods: {
listenForQuickActions() {
$(document).on('ajax:success', '.gfm-form', this.quickActionListened);
- eventHub.$on('timeTrackingUpdated', (data) => {
+ eventHub.$on('timeTrackingUpdated', data => {
this.quickActionListened(null, data);
});
},
@@ -34,9 +34,7 @@ export default {
const subscribedCommands = ['spend_time', 'time_estimate'];
let changedCommands;
if (data !== undefined) {
- changedCommands = data.commands_changes
- ? Object.keys(data.commands_changes)
- : [];
+ changedCommands = data.commands_changes ? Object.keys(data.commands_changes) : [];
} else {
changedCommands = [];
}