Fixed
Status Update
Comments
mi...@google.com <mi...@google.com> #2
[Empty comment from Monorail migration]
da...@gmail.com <da...@gmail.com> #3
The main features are shown on the main index of the home page. Should the about page include the same information that is there, or be more detailed?
da...@gmail.com <da...@gmail.com> #4
I would say more details. Alternatively we could just rename it to "Project History" and move it to a less prominent place.
ma...@gmail.com <ma...@gmail.com> #5
[Monorail components: Homepage]
da...@gmail.com <da...@gmail.com> #6
[Monorail components: Documentation]
da...@gmail.com <da...@gmail.com> #8
[Empty comment from Monorail migration]
da...@gmail.com <da...@gmail.com> #9
I was able to reproduce this problem on gerrit 3.4 site, with change.mergeabilityComputationBehavior value set to API_REF_UPDATED_AND_CHANGE_REINDEX.
The conflict changes section is not rendered for this change:
https://review.gerrithub.io/c/redhat-performance/quads/+/513621
Even though, this change is mergeable, and if I invoke conflicts:513621 I'm getting list of 15 changes:
https://review.gerrithub.io/q/conflicts:513621
Debugging the UI code reveals, that this.mergeable in gr-related-changes-list is always undefined, even though the change.mergeable for this change is true.
//CC Patrick and Edwin, because the refactoring done in: [1] is related here.
[1]https://gerrit-review.googlesource.com/c/gerrit/+/250233
The conflict changes section is not rendered for this change:
Even though, this change is mergeable, and if I invoke conflicts:513621 I'm getting list of 15 changes:
Debugging the UI code reveals, that this.mergeable in gr-related-changes-list is always undefined, even though the change.mergeable for this change is true.
//CC Patrick and Edwin, because the refactoring done in: [1] is related here.
[1]
da...@gmail.com <da...@gmail.com> #11
[Empty comment from Monorail migration]
da...@gmail.com <da...@gmail.com> #12
Apparently, it was broken only very recently.
I already posted a change from gerrit 3.2.x site, and here is another change from gerrit 3.3.4 site, where "Merge conflicts" section still working:
[1]https://review.typo3.org/c/Packages/TYPO3.CMS/+/69226
I already posted a change from gerrit 3.2.x site, and here is another change from gerrit 3.3.4 site, where "Merge conflicts" section still working:
[1]
da...@gmail.com <da...@gmail.com> #13
da...@gmail.com <da...@gmail.com> #14
[Empty comment from Monorail migration]
gi...@appspot.gserviceaccount.com <gi...@appspot.gserviceaccount.com> #15
The following revision refers to this bug:
https://gerrit.googlesource.com/gerrit/+/901326af1a4ef069d55043bfea0a898e1724b1a8
commit 901326af1a4ef069d55043bfea0a898e1724b1a8
Author: David Ostrovsky <david@ostrovsky.org>
Date: Fri May 21 04:47:03 2021
gr-change-view: Pass mergeable parameter to related changes view
In Ic42f9af7600 related change list view was refactored. That was later
cherry-picked into stable-3.4 and included starting from rc3.
Mistakenly, mergeable attribute was not passed from change view and as
the consequence, merge conflict changes were not loading any more.
Bug:https://crbug.com/gerrit/14561
Change-Id: Icad06c77de5cff74ff0af3901b6066ece88a3164
[modify]https://gerrit.googlesource.com/gerrit/+/901326af1a4ef069d55043bfea0a898e1724b1a8/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_html.ts
commit 901326af1a4ef069d55043bfea0a898e1724b1a8
Author: David Ostrovsky <david@ostrovsky.org>
Date: Fri May 21 04:47:03 2021
gr-change-view: Pass mergeable parameter to related changes view
In Ic42f9af7600 related change list view was refactored. That was later
cherry-picked into stable-3.4 and included starting from rc3.
Mistakenly, mergeable attribute was not passed from change view and as
the consequence, merge conflict changes were not loading any more.
Bug:
Change-Id: Icad06c77de5cff74ff0af3901b6066ece88a3164
[modify]
lu...@gmail.com <lu...@gmail.com> #16
[Empty comment from Monorail migration]
is...@google.com <is...@google.com> #17
Edits were made to reflect the following in Monorail: auto-CCs.
Description
Affected Version:
What steps will reproduce the problem?
1. Create two changes that will edit the same line so they are in conflict to each other
2. Have change.mergeabilityComputationBehavior set to API_REF_UPDATED_AND_CHANGE_REINDEX
3. Open change screen of one of those changes
What is the expected output?
There should be the "Conflicts with" section visible on the right side.
What do you see instead?
Since some time (maybe Gerrit 3.2) this section is not visible.
Please provide any additional information below.
I checked in Developer Tools as of Gerrit 3.4 that
mergeable
property ofgr-related-changes-list
is undefined when that components checks it to decide whenever callthis.restApiService.getChangeConflicts
to get list of conflicted changes, so in practice it never issue that request.I have no clue about Polymer, but I suspect that the issue was introduced in I01d03de9f2feb5b962fb561db8c4f380f4fae230 (https://gerrit-review.googlesource.com/c/gerrit/+/153850/ ). In that change I see that this
mergeable
property is introduced ingr-related-changes-list
, and passed to it fromgr-change-view
. But ingr-change-view
it is set in some concurrently run promise inside_reload
function, which I suspect creates a race condition.