opendev/gerrit
Code Issues Proposed changes

Merge "Add tooltip on 'Cannot Merge' telling that a rebase is needed"

Browse Source
This commit is contained in:
Shawn Pearce
2013-11-25 18:15:40 +00:00
committed by Gerrit Code Review
parent 429512878d efad906025
commit b3958ca94d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.ui.xml
View File

@@ -426,7 +426,9 @@ limitations under the License.
<div ui:field='notMergeable' <div ui:field='notMergeable'
class='{style.notMergeable}' class='{style.notMergeable}'
style='display: none' style='display: none'
aria-hidden='true'> aria-hidden='true'
title='The change cannot be merged due to a path conflict. Rebase the change locally and upload the rebased commit for review.'>
<ui:attribute name='title'/>
<ui:msg>Cannot Merge</ui:msg> <ui:msg>Cannot Merge</ui:msg>
</div> </div>
</td> </td>