diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-28 19:45:28 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-28 19:45:28 +0000 |
| commit | 05c8ec6cb85a3943b53cbd5757e7baea300dac68 (patch) | |
| tree | 4348de62891a753f133f08d2a57e915a5a820064 | |
| parent | 261f5a68edc37eca25b9f49f2d3d75261bd794a7 (diff) | |
| parent | 27fab2ef9dac3fe44397f404fc4c948a3a4d19ca (diff) | |
| download | gitlab-ce-05c8ec6cb85a3943b53cbd5757e7baea300dac68.tar.gz | |
Merge branch '27622-cycle-analytics-loading' into 'master'
Fix Cycle Analytics -> Plan is loading forever
Closes #27622
See merge request !9577
| -rw-r--r-- | app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6 b/app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6 index 3efeb141008..7ae9de7297c 100644 --- a/app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6 +++ b/app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6 @@ -75,8 +75,11 @@ const DEFAULT_EVENT_OBJECTS = require('./default_event_objects'); const eventItem = Object.assign({}, DEFAULT_EVENT_OBJECTS[stage.slug], item); eventItem.totalTime = eventItem.total_time; - eventItem.author.webUrl = eventItem.author.web_url; - eventItem.author.avatarUrl = eventItem.author.avatar_url; + + if (eventItem.author) { + eventItem.author.webUrl = eventItem.author.web_url; + eventItem.author.avatarUrl = eventItem.author.avatar_url; + } if (eventItem.created_at) eventItem.createdAt = eventItem.created_at; if (eventItem.short_sha) eventItem.shortSha = eventItem.short_sha; |