Google Git
Sign in
gerrit/gerrit/4b1af2ec0d4e263d375bb666e53658751cf2951b^2..4b1af2ec0d4e263d375bb666e53658751cf2951b/.
commit
4b1af2ec0d4e263d375bb666e53658751cf2951b
[log]
author
Edwin Kempin <ekempin@google.com>
Mon Mar 14 17:45:24 2016 +0000
committer
Gerrit Code Review <noreply-gerritcodereview@google.com>
Mon Mar 14 17:45:26 2016 +0000
tree
e51dba4352ccf68881b51d78a6b841a55e59c9fb
parent
80c353cd779eeefa2b3f74a4e970cc323b17e1a9 [diff]
parent
cf2fa7983f4046a97f01d58ae6dcd4f8bc095386 [diff]
Merge changes I41ef88dd,I9492c9c5

* changes:
  Combine ChangeNoteUtil and CommentsInNotesUtil
  Include a UUID portion in NoteDb author identities

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccessSectionEditor.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccessSectionEditor.ui.xml
index 52f3588..3710265 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccessSectionEditor.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccessSectionEditor.ui.xml

@@ -88,9 +88,6 @@
   .addContainer:hover {
     background-color: selectionColor;
   }
-  .addSelector {
-    font-size: 80%;
-  }
 
   .deleteIcon {
     position: absolute;
@@ -139,9 +136,7 @@
       ui:field='permissionContainer'
       styleName='{style.permissionList}'/>
   <div ui:field='addContainer' class='{style.addContainer}'>
-    <g:ValueListBox
-        ui:field='permissionSelector'
-        styleName='{style.addSelector}' />
+    <g:ValueListBox ui:field='permissionSelector'/>
   </div>
 </div>
 

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessEditor.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessEditor.ui.xml
index ebe6caf..7fbf70d 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessEditor.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAccessEditor.ui.xml

@@ -48,7 +48,6 @@
 
   .addContainer {
     margin-top: 5px;
-    font-size: 80%;
   }
   .addContainer:hover {
     background-color: selectionColor;

diff --git a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.js b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.js
index 947d982..39e50a9 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.js
+++ b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.js

@@ -64,7 +64,7 @@
       }).then(function(loggedIn) {
         if (!loggedIn) { return; }
 
-        _this._getReviewedFiles().then(function(reviewed) {
+        return _this._getReviewedFiles().then(function(reviewed) {
           _this._reviewed = reviewed;
         });
       }));