commit 9797e3850b556669183d0710a3dea28d9be98b1a
author Dave Borowitz <dborowitz@google.com> Wed Sep 13 18:30:47 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 13 18:30:47 2017 +0000
tree 2875d774093009f5f5608b65ee9e57cfc616f68f
parent 5ec130686a73ed6dfe4b13885785740b643ceeb9
parent 42db934ffaa7f9294f8ae17c2ed9eafdf4978c82

Merge "Add pure_revert Prolog fact"

polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.html

diff --git a/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.html b/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.html
index edd5389..238db9c 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.html
+++ b/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.html
@@ -94,9 +94,6 @@
       .separator {
         margin: 0 .25em;
       }
-      .expandInline {
-        padding-right: .25em;
-      }
       .patchSetSelect {
         max-width: 8em;
       }

polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html

diff --git a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html
index 95bfc70..3464fea 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html
+++ b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html
@@ -150,6 +150,9 @@
       #container.editLoaded .hideOnEdit {
         display: none;
       }
+      .expandInline {
+        padding-right: .25em;
+      }
       @media screen and (max-width: 50em) {
         .desktop {
           display: none;

polygerrit-ui/app/elements/core/gr-reporting/gr-reporting.js

diff --git a/polygerrit-ui/app/elements/core/gr-reporting/gr-reporting.js b/polygerrit-ui/app/elements/core/gr-reporting/gr-reporting.js
index 61251af..5a8ddf6 100644
--- a/polygerrit-ui/app/elements/core/gr-reporting/gr-reporting.js
+++ b/polygerrit-ui/app/elements/core/gr-reporting/gr-reporting.js
@@ -198,7 +198,7 @@
      */
     timeEnd(name) {
       const baseTime = this._baselines[name] || 0;
-      const time = this.now() - baseTime;
+      const time = Math.round(this.now() - baseTime) + 'ms';
       this.reporter(TIMING.TYPE, TIMING.CATEGORY, name, time);
       delete this._baselines[name];
     },

polygerrit-ui/app/elements/core/gr-reporting/gr-reporting_test.html

diff --git a/polygerrit-ui/app/elements/core/gr-reporting/gr-reporting_test.html b/polygerrit-ui/app/elements/core/gr-reporting/gr-reporting_test.html
index 67cd329..e88096b 100644
--- a/polygerrit-ui/app/elements/core/gr-reporting/gr-reporting_test.html
+++ b/polygerrit-ui/app/elements/core/gr-reporting/gr-reporting_test.html
@@ -85,10 +85,10 @@
       nowStub.returns(3.123);
       element.timeEnd('foo');
       assert.isTrue(element.reporter.calledWithExactly(
-          'timing-report', 'UI Latency', 'foo', 3.123
+          'timing-report', 'UI Latency', 'foo', '3ms'
       ));
       assert.isTrue(element.reporter.calledWithExactly(
-          'timing-report', 'UI Latency', 'bar', 1
+          'timing-report', 'UI Latency', 'bar', '1ms'
       ));
     });
 
@@ -104,7 +104,7 @@
         sandbox.stub(element, 'now').returns(42);
         element.pluginsLoaded();
         assert.isTrue(element.defaultReporter.calledWithExactly(
-            'timing-report', 'UI Latency', 'PluginsLoaded', 42
+            'timing-report', 'UI Latency', 'PluginsLoaded', '42ms'
         ));
       });