Suggestion appears applied but is not
In Update snippets crosslinks (!107404 - merged), I reviewed a community contribution to our docs. Something strange happened with my suggestion, though:
- I created a comment that contained a suggestion: !107404 (comment 1215360323)
- I approved, then applied -- or thought I applied - the suggestion. Note that the suggestion shows as Applied.
- I saw the Applied pill appear, and tapped the merge button. (I do not remember if it said
merge
ormerge when pipeline succeeds
, and I suspect that's important here.) - Now look at the list of commits. There's only one - my applied suggestion - !107404 (9bbf0cf1). Deja's commit is not listed there, only mine.
- I'd expect to see a second pipeline for my commit, but there wasn't one. https://gitlab.com/gitlab-org/gitlab/-/pipelines/727178885 is the result of me blurting out "wait what?" in this comment !107404 (comment 1215363273) and starting one manually.
-
@kerrizor
pointed out that the merge commit (5f4e53af) shows both of us, and the change to both files. - When I refreshed
master
locally just now, I see Deja's version of the line, not mine. - Deja noted some weirdness on her side too: "To add to the weirdness, when I was first creating the merge request earlier I made my commit and then created the merge request and it showed nothing and no changes until I refreshed the page and it popped up. That had never happened to me before."
I've created !107417 (merged) to fix the line, but this sequence of events was weird enough that I felt I should document it.