##// END OF EJS Templates
pull-requests: fixed case for GIT repositories when a merge check failed due to merge conflicts the pull request wrongly reported missing commits....
pull-requests: fixed case for GIT repositories when a merge check failed due to merge conflicts the pull request wrongly reported missing commits. - we're now searching for dangling commits in a repo that has them and cannot see them because of failed merge checks. - pull-request: will save metadata during merge simulation so merge conflicts are permanently stored, and showed to all users.

File last commit:

r2637:96836581 default
r4299:04e45b92 default
Show More
settings_automation.mako
9 lines | 510 B | application/x-mako | MakoHtmlLexer
automation: add EE feature placeholder
r2637 <div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">${_('Admin Automation')}</h3>
</div>
<div class="panel-body">
<h4>${_('This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license.').format(sales_email='<a href="mailto:sales@rhodecode.com">sales@rhodecode.com</a>')|n}</h4>
<img style="width: 100%; height: 100%" src="${h.asset('images/ee_features/admin_automation.png')}"/>
</div>
</div>