diff options
author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-17 06:18:44 +0300 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-21 21:57:10 +0300 |
commit | c0c4b2767f8ec0ab827675f1ba37de15f286c308 (patch) | |
tree | 33653b717cb32953869107bbc5aec605e4ee90c1 /app/assets/javascripts/cycle_analytics | |
parent | 17046c35464c94080598364bf67bb89545dd0b65 (diff) |
Update ItemMergeRequestComponent structure
Diffstat (limited to 'app/assets/javascripts/cycle_analytics')
-rw-r--r-- | app/assets/javascripts/cycle_analytics/components/item_merge_request_component.js.es6 | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/app/assets/javascripts/cycle_analytics/components/item_merge_request_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/item_merge_request_component.js.es6 index 0fd0767a3d0..2ceadcb61a5 100644 --- a/app/assets/javascripts/cycle_analytics/components/item_merge_request_component.js.es6 +++ b/app/assets/javascripts/cycle_analytics/components/item_merge_request_component.js.es6 @@ -20,13 +20,33 @@ }, template: ` <div> - <p> - <h5> - <a href="mergeRequest.url"> + <div class="item-details"> + <img class="avatar" :src="mergeRequest.author.avatarUrl"> + <h5 class="item-title"> + <a :href="mergeRequest.url"> {{ mergeRequest.title }} </a> </h5> - </p> + <a :href="mergeRequest.url" class="issue-link"> + !{{ mergeRequest.iid }} + </a> + · + <span> + Opened + <a :href="mergeRequest.url" class="issue-date"> + {{ mergeRequest.createdAt }} + </a> + </span> + <span> + by + <a :href="mergeRequest.author.webUrl" class="issue-author-link"> + {{ mergeRequest.author.name }} + </a> + </span> + </div> + <div class="item-time"> + <total-time :time="mergeRequest.totalTime"></total-time> + </div> </div> `, }); |