Becky Siegel 94db86fc1b Make sure 'Merge Conflict' displays on change view ...

Previously, if a change status was 'NEW' the function that determines
if 'Merge Conflict' should be displayed was not called. This change
ensures that it is not bypassed if a change is 'NEW'

Change-Id: Ia014452be5d7b8a24abb6a8b29483dd5289cc515

2017-05-17 22:09:00 +01:00

..

gr-account-entry

Collection of prospective test flake fixes

2017-04-14 18:56:41 +00:00

gr-account-list

Collection of prospective test flake fixes

2017-04-14 18:56:41 +00:00

gr-change-actions

Fix PolyGerrit URLs to support prefixed URL

2017-04-19 09:33:58 +00:00

gr-change-metadata

Fix PolyGerrit URLs to support prefixed URL

2017-04-19 09:33:58 +00:00

gr-change-view

Make sure 'Merge Conflict' displays on change view

2017-05-17 22:09:00 +01:00

gr-comment-list

Use 'Commit message' and 'Merge list' in comment-list

2017-05-08 19:09:10 +00:00

gr-commit-info

Collection of prospective test flake fixes

2017-04-14 18:56:41 +00:00

gr-confirm-abandon-dialog

Add autocomplete to iron-autogrow-textarea elements

2016-11-16 01:26:41 +00:00

gr-confirm-cherrypick-dialog

Collection of prospective test flake fixes

2017-04-14 18:56:41 +00:00

gr-confirm-rebase-dialog

Collection of prospective test flake fixes

2017-04-14 18:56:41 +00:00

gr-confirm-revert-dialog

Collection of prospective test flake fixes

2017-04-14 18:56:41 +00:00

gr-download-dialog

Fix PolyGerrit URLs to support prefixed URL

2017-04-19 09:33:58 +00:00

gr-file-list

Use 'Merge list' as display name for /MERGE_LIST

2017-05-08 10:41:59 +09:00

gr-message

Collection of prospective test flake fixes

2017-04-14 18:56:41 +00:00

gr-messages-list

Collection of prospective test flake fixes

2017-04-14 18:56:41 +00:00

gr-related-changes-list

Fix PolyGerrit URLs to support prefixed URL

2017-04-19 09:33:58 +00:00

gr-reply-dialog

Fix PolyGerrit URLs to support prefixed URL

2017-04-19 09:33:58 +00:00

gr-reviewer-list

Collection of prospective test flake fixes

2017-04-14 18:56:41 +00:00