Commit cae1d071e4
Verified · cmc
Layout: unified · split
Parity.org +9
| @@ -44,6 +44,7 @@ browser-only and the iOS build screen unable to say more than the log. | |||
| 44 | | retarget | yes | yes | no | | 44 | | retarget | yes | yes | no | |
| 45 | | milestone | yes | yes | yes | | 45 | | milestone | yes | yes | yes | |
| 46 | | choose body markup | yes | no | no | | 46 | | choose body markup | yes | no | no | |
| 47 | | stacked merge requests | yes | yes | no | | ||
| 47 | 48 | ||
| 48 | Reviews and checks carry the time they last said something, and a | 49 | Reviews and checks carry the time they last said something, and a |
| 49 | =ci/<job>= check carries how long its build ran, so a merge request | 50 | =ci/<job>= check carries how long its build ran, so a merge request |
| @@ -54,6 +55,14 @@ request names who resolved it and when; a row without that stamp — a | |||
| 54 | =mr.merged= event to backfill from — says neither rather than | 55 | =mr.merged= event to backfill from — says neither rather than |
| 55 | inventing a time. | 56 | inventing a time. |
| 56 | 57 | ||
| 58 | A merge request whose target is another open merge request's source | ||
| 59 | branch is stacked on it: =mr show= and the page say so both ways, and | ||
| 60 | when the lower one merges, everything stacked on it is retargeted onto | ||
| 61 | what it merged into with its reviews kept. A squash or rebase merge is | ||
| 62 | refused while anything is stacked on the merge request, since it would | ||
| 63 | rewrite the commits the stack builds on. The iOS client renders the | ||
| 64 | retarget but has no stack view yet. | ||
| 65 | |||
| 57 | Creating from a fork works anywhere the source can be typed as | 66 | Creating from a fork works anywhere the source can be typed as |
| 58 | =owner/name:branch=; only the web lacks it. Retargeting moves an open | 67 | =owner/name:branch=; only the web lacks it. Retargeting moves an open |
| 59 | merge request onto another branch of the same repository and stales the | 68 | merge request onto another branch of the same repository and stales the |