commit 4fd482530dc7f6121459690075bbd6e286027aaa
author Becky Siegel <beckysiegel@google.com> Wed Jun 21 23:29:47 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 21 23:29:47 2017 +0000
tree 1ba645a3db55bf3030dee60fb67860a73e2dc1aa
parent baf8b818dae418b73a87b05f53f91da39cd0eb37
parent 9aeb6167256ad0aa0830553024b3697e746cce73

Merge "Update page nav styles"

polygerrit-ui/app/.eslintrc.json

diff --git a/polygerrit-ui/app/.eslintrc.json b/polygerrit-ui/app/.eslintrc.json
index 14c419c..2f77b42 100644
--- a/polygerrit-ui/app/.eslintrc.json
+++ b/polygerrit-ui/app/.eslintrc.json
@@ -1,6 +1,5 @@
 {
   "extends": ["eslint:recommended", "google"],
-  "installedESLint": true,
   "env": {
     "browser": true,
     "es6": true

polygerrit-ui/app/elements/admin/gr-admin-project/gr-admin-project.js

diff --git a/polygerrit-ui/app/elements/admin/gr-admin-project/gr-admin-project.js b/polygerrit-ui/app/elements/admin/gr-admin-project/gr-admin-project.js
index 9672803..3422f17 100644
--- a/polygerrit-ui/app/elements/admin/gr-admin-project/gr-admin-project.js
+++ b/polygerrit-ui/app/elements/admin/gr-admin-project/gr-admin-project.js
@@ -29,6 +29,10 @@
       value: 'FAST_FORWARD_ONLY',
       label: 'Fast forward only',
     },
+    rebaseAlways: {
+      value: 'REBASE_ALWAYS',
+      label: 'Rebase Always',
+    },
     rebaseIfNecessary: {
       value: 'REBASE_IF_NECESSARY',
       label: 'Rebase if necessary',