diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-03-02 10:22:56 +0100 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-03-02 10:22:56 +0100 |
| commit | ddfd09c09cb904529df567e5606d76c467ed856f (patch) | |
| tree | d17a48cf08e580cac866417700ea1ffe74c48bd7 /app/assets/javascripts/issuable/time_tracking/time_tracking_bundle.js.es6 | |
| parent | 52c4a7866ed010d8db67e5ca976d8c73d4084784 (diff) | |
| parent | 3b3f0fab452fb9cbe4fbe7f75112bef3a7f9d039 (diff) | |
| download | gitlab-ce-ddfd09c09cb904529df567e5606d76c467ed856f.tar.gz | |
Merge branch 'master' into zj-create-mattermost-team
Diffstat (limited to 'app/assets/javascripts/issuable/time_tracking/time_tracking_bundle.js.es6')
| -rw-r--r-- | app/assets/javascripts/issuable/time_tracking/time_tracking_bundle.js.es6 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/issuable/time_tracking/time_tracking_bundle.js.es6 b/app/assets/javascripts/issuable/time_tracking/time_tracking_bundle.js.es6 index 1ca01d3bdb9..958a0cc6d50 100644 --- a/app/assets/javascripts/issuable/time_tracking/time_tracking_bundle.js.es6 +++ b/app/assets/javascripts/issuable/time_tracking/time_tracking_bundle.js.es6 @@ -39,8 +39,9 @@ require('../../subbable_resource'); listenForSlashCommands() { $(document).on('ajax:success', '.gfm-form', (e, data) => { const subscribedCommands = ['spend_time', 'time_estimate']; - const changedCommands = data.commands_changes; - + const changedCommands = data.commands_changes + ? Object.keys(data.commands_changes) + : []; if (changedCommands && _.intersection(subscribedCommands, changedCommands).length) { this.fetchIssuable(); } |