diff --git a/app/assets/javascripts/cycle_analytics/components/item_commit_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/item_commit_component.js.es6
index 344cb77d7ccaf98613e25f8f083ff04f5911d805..5a8d62ce87d89ea10661bfd3998e7eca670078cd 100644
--- a/app/assets/javascripts/cycle_analytics/components/item_commit_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/item_commit_component.js.es6
@@ -14,9 +14,36 @@
*/
global.cycleAnalytics.ItemCommitComponent = Vue.extend({
- template: '#item-commit-component',
props: {
commit: Object,
- }
+ },
+ template: `
+
+
+
+ {{ commit.totalTime.hours }}
+ hr
+
+
+ {{ commit.totalTime.minutes }}
+ mins
+
+
+ `,
});
}(window.gl || (window.gl = {})));
diff --git a/app/assets/javascripts/cycle_analytics/components/stage_plan_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/stage_plan_component.js.es6
index 5b83bec58b6acffd561097360cc79d6832c9bd8a..394990d4bb357035ab0402122c15d0ba1be0a96a 100644
--- a/app/assets/javascripts/cycle_analytics/components/stage_plan_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/stage_plan_component.js.es6
@@ -14,8 +14,8 @@
Time before an issue starts implementation
-
- -
+
diff --git a/app/assets/stylesheets/pages/cycle_analytics.scss b/app/assets/stylesheets/pages/cycle_analytics.scss
index 09625d178c5ceeda0d98630a5de6fd6813ca24ae..dec2595b50d57729cb59a4152637b9147fa1bb40 100644
--- a/app/assets/stylesheets/pages/cycle_analytics.scss
+++ b/app/assets/stylesheets/pages/cycle_analytics.scss
@@ -327,5 +327,23 @@
color: $gl-text-color;
}
}
+
+ .commit-author-link {
+ color: $gl-dark-link-color;
+ }
+
+ // Custom CSS for components
+ .item-conmmit-component {
+ .commit-icon {
+ position: relative;
+ top: 3px;
+ left: 1px;
+ display: inline-block;
+
+ svg {
+ float: left;
+ }
+ }
+ }
}
}
diff --git a/app/views/projects/cycle_analytics/show.html.haml b/app/views/projects/cycle_analytics/show.html.haml
index bb4854d88c5485295d840d8d17a432e1b3685e30..ea3ae13b6d86d7425fa987127fa5f1fbf68a5b68 100644
--- a/app/views/projects/cycle_analytics/show.html.haml
+++ b/app/views/projects/cycle_analytics/show.html.haml
@@ -119,7 +119,6 @@
%li{ "v-for" => "mergeRequest in items" }
%item-merge-request-component{ ":merge-request" => "mergeRequest" }
-
%script{ type: 'text/x-template', id: 'stage-staging-component' }
%div
.events-description
@@ -136,20 +135,6 @@
%li{ "v-for" => "issue in items" }
%item-issue-component{ ":issue" => "issue" }
-%script{ type: 'text/x-template', id: 'item-commit-component' }
- %div
- %p
- %h5
- %a{:href => "commit.url"}
- {{ commit.title }}
- %span
- First
- %a{:href => "#"}
- {{ commit.hash }}
- pushed by
- %a{:href => "commit.profile"}
- {{ commit.author }}
-
%script{ type: 'text/x-template', id: 'item-merge-request-component' }
%div
%p