diff options
Diffstat (limited to 'polygerrit-ui/app/elements/settings')
3 files changed, 16 insertions, 0 deletions
diff --git a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html index 799cf5943b..be7f3da842 100644 --- a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html +++ b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html @@ -194,6 +194,18 @@ limitations under the License. </gr-select> </span> </section> + <section hidden$="[[!_localPrefs.default_base_for_merges]]"> + <span class="title">Default Base For Merges</span> + <span class="value"> + <gr-select + bind-value="{{_localPrefs.default_base_for_merges}}"> + <select> + <option value="AUTO_MERGE">Auto Merge</option> + <option value="FIRST_PARENT">First Parent</option> + </select> + </gr-select> + </span> + </section> <section> <span class="title">Diff view</span> <span class="value"> diff --git a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.js b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.js index 0ce8ce0c80..ec98ad8778 100644 --- a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.js +++ b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.js @@ -25,6 +25,7 @@ 'diff_view', 'publish_comments_on_push', 'work_in_progress_by_default', + 'default_base_for_merges', 'signed_off_by', 'email_format', 'size_bar_in_change_table', diff --git a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view_test.html b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view_test.html index f47816f4b1..9864a864a2 100644 --- a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view_test.html +++ b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view_test.html @@ -88,6 +88,7 @@ limitations under the License. diff_view: 'UNIFIED_DIFF', email_strategy: 'ENABLED', email_format: 'HTML_PLAINTEXT', + default_base_for_merges: 'FIRST_PARENT', size_bar_in_change_table: true, my: [ @@ -168,6 +169,8 @@ limitations under the License. .firstElementChild.bindValue, preferences.email_strategy); assert.equal(valueOf('Email format', 'preferences') .firstElementChild.bindValue, preferences.email_format); + assert.equal(valueOf('Default Base For Merges', 'preferences') + .firstElementChild.bindValue, preferences.default_base_for_merges); assert.equal(valueOf('Diff view', 'preferences') .firstElementChild.bindValue, preferences.diff_view); assert.equal(valueOf('Show size bars in file list', 'preferences') |