##// END OF EJS Templates
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

File last commit:

r1484:5e0cbb3f default
r2784:e8c62649 default
Show More
alerts.less
57 lines | 1.1 KiB | text/x-less | LessCssLexer
.alert1 { .border ( @border-thickness-tags, @alert1 ); color:@alert1; }
.alert2 { .border ( @border-thickness-tags, @alert2 ); color:@alert2; }
.alert3 { .border ( @border-thickness-tags, @alert3 ); color:@alert3; }
.alert4 { .border ( @border-thickness-tags, @alert4 ); color:@alert4; }
.alert {
clear: both;
padding: @padding;
border: @border-thickness solid;
border-radius: @border-radius;
// overwritter css from specific alerts
color: @grey3;
border-color: @alert4;
background-color: @alert4-inner;
a {
text-decoration: underline;
}
.close {
color: @grey3;
}
}
.infoform .alert {
width: 100%;
margin-top: 0;
}
.alert-success {
border-color: @alert1;
background-color: @alert1-inner;
}
.alert-error {
border-color: @alert2;
background-color: @alert2-inner;
}
.alert-warning {
border-color: @alert3;
background-color: @alert3-inner;
}
.alert-dismissable {
padding-right: 10px;
.close {
margin-top: -5px;
}
}
.loginbox {
.alert {
margin: 0 auto 35px auto;
}
}