diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-28 23:12:40 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-28 23:12:40 +0300 |
commit | 936215433dec7b1e5d67b980098b97a012219bae (patch) | |
tree | bac299b1b3bd2c5da5bf243b7332329c03c1ad80 /app/assets/javascripts/cycle_analytics | |
parent | 6862e788e8b32196d750152c4657ea95d431e04f (diff) | |
parent | 05c8ec6cb85a3943b53cbd5757e7baea300dac68 (diff) |
Merge branch 'master' into add-svg-loader
* master: (21 commits)
Move `Group -> Members` to top-level, fix missing sub-nav for Subgroups
Left align logo; increase max width of title
Add newline to end of frontend.md.
Clone nested objects from default data. Checks if key is present before accessing it
Update CHANGELOG.md for 8.17.1
Document use of AirBnb js styleguide and eslint.
Don't allow a project to be shared with an ancestor of the group it is in
Fix access to projects shared with a nested group
Ignore builds dir when run rubocop check
Remove hidden-xs classes from last columns in environments and pipelines table. Transform pipelines table css to match structure of pipelines table Make environments table overflow
Use exceptions for MergeService error handling
Clarify when to create EE compatibility MR in code review process
New runner API returns 204
Backport new behavior to CI API
Backport API to V3
Update documentation
Return 204 for delete endpoints
API project create: Make name or path required
Only create unmergeable todos once
Put back the new project button
...
Diffstat (limited to 'app/assets/javascripts/cycle_analytics')
-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; |