##// 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:

r1748:0fcdd9e3 default
r2784:e8c62649 default
Show More
error_document.mako
76 lines | 3.4 KiB | application/x-mako | MakoHtmlLexer
templating: use .mako as extensions for template files.
r1282 ## -*- coding: utf-8 -*-
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Error - ${c.error_message}</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="robots" content="index, nofollow"/>
<link rel="icon" href="${h.asset('images/favicon.ico')}" sizes="16x16 32x32" type="image/png" />
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
%if c.redirect_time:
<meta http-equiv="refresh" content="${c.redirect_time}; url=${c.url_redirect}"/>
%endif
<link rel="stylesheet" type="text/css" href="${h.asset('css/style.css', ver=c.rhodecode_version_hash)}" media="screen"/>
<!--[if IE]>
<link rel="stylesheet" type="text/css" href="${h.asset('css/ie.css')}" media="screen"/>
<![endif]-->
<style>body { background:#eeeeee; }</style>
templates: removed some unused JS variables....
r1285 <script type="text/javascript">
// register templateContext to pass template variables to JS
var templateContext = {timeago: {}};
</script>
templating: use .mako as extensions for template files.
r1282 <script type="text/javascript" src="${h.asset('js/scripts.js', ver=c.rhodecode_version_hash)}"></script>
</head>
<body>
<div class="wrapper error_page">
<div class="sidebar">
error-document: make sure the error document has registered helpers,...
r1748 <a href="${h.route_path('home')}"><img class="error-page-logo" src="${h.asset('images/RhodeCode_Logo_Black.png')}" alt="RhodeCode"/></a>
templating: use .mako as extensions for template files.
r1282 </div>
<div class="main-content">
<h1>
<span class="error-branding">
${h.branding(c.rhodecode_name)}
</span><br/>
${c.error_message} | <span class="error_message">${c.error_explanation}</span>
</h1>
error-document: make sure the error document has registered helpers,...
r1748 % if c.messages:
% for message in c.messages:
templating: use .mako as extensions for template files.
r1282 <div class="alert alert-${message.category}">${message}</div>
% endfor
% endif
%if c.redirect_time:
<p>${_('You will be redirected to %s in %s seconds') % (c.redirect_module,c.redirect_time)}</p>
%endif
<div class="inner-column">
<h4>Possible Causes</h4>
<ul>
% if c.causes:
%for cause in c.causes:
<li>${cause}</li>
%endfor
%else:
<li>The resource may have been deleted.</li>
<li>You may not have access to this repository.</li>
<li>The link may be incorrect.</li>
%endif
</ul>
</div>
<div class="inner-column">
<h4>Support</h4>
<p>For support, go to <a href="${c.visual.rhodecode_support_url}" target="_blank">${_('Support')}</a>.
routing: switched static redirection links to pyramid....
r1679 It may be useful to include your log file; see the log file locations <a href="${h.route_url('enterprise_log_file_locations')}">here</a>.
templating: use .mako as extensions for template files.
r1282 </p>
</div>
<div class="inner-column">
<h4>Documentation</h4>
routing: switched static redirection links to pyramid....
r1679 <p>For more information, see <a href="${h.route_url('enterprise_docs')}">docs.rhodecode.com</a>.</p>
templating: use .mako as extensions for template files.
r1282 </div>
</div>
</div>
</body>
</html>