Modify ↓
Opened 8 years ago
Closed 8 years ago
#12730 closed defect (fixed)
Revert buttons are no longer shown in displaying ticket conflicts
| Reported by: | Ryan J Ollos | Owned by: | Ryan J Ollos |
|---|---|---|---|
| Priority: | normal | Milestone: | 1.2.1 |
| Component: | ticket system | Version: | |
| Severity: | normal | Keywords: | |
| Cc: | Branch: | ||
| Release Notes: |
Fixed missing ticket field change conflict markers (regression). |
||
| API Changes: | |||
| Internal Changes: | |||
Description (last modified by )
On 1.2-stable we see:
On trunk the revert links are no longer displayed:
For both 1.2-stable and trunk, the property changes should be highlighted as conflicts. Here is what we see on 1.0-stable:
Attachments (3)
Change History (9)
by , 8 years ago
| Attachment: | Screen Shot 2017-03-15 at 11.37.36.png added |
|---|
by , 8 years ago
| Attachment: | Screen Shot 2017-03-15 at 11.37.12.png added |
|---|
by , 8 years ago
| Attachment: | Screen Shot 2017-03-15 at 11.34.17.png added |
|---|
comment:1 by , 8 years ago
| Description: | modified (diff) |
|---|
comment:2 by , 8 years ago
| Description: | modified (diff) |
|---|
comment:3 by , 8 years ago
| Component: | general → ticket system |
|---|---|
| Milestone: | 1.3.2 → 1.2.1 |
| Owner: | set to |
| Status: | new → assigned |
comment:4 by , 8 years ago
| Release Notes: | modified (diff) |
|---|
Fixed on 1.2-stable in [15690:15691]. On the trunk, the variable conflicts was being reassigned in ticket.html. Proposed fix: [dad377d0/rjollos.git].
comment:5 by , 8 years ago
Good catch! Thanks for taking care of this one. Fix looks good (but maybe emph_<sentence> instead of <sentence>_text?).
Note:
See TracTickets
for help on using tickets.
Revert buttons restored in r15686. Assigning to milestone:1.2.1 to fix the missing change conflict markers.