Skip to content

Commit afa6b57

Browse files
committed
Merge branch 'release/3.0.3'
2 parents bc5fdcf + 0654837 commit afa6b57

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

templates/docs_deployments/index.html.twig

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,7 @@
8585
<a href="{{ deployment|intercept_link_to_docs }}" rel="noopener noreferrer" target="_blank">{{ deployment.targetBranchDirectory }}</a>
8686
</td>
8787
<td data-type="localdate">
88-
{% if deployment.buildKey %}
89-
<a href="https://bamboo.typo3.com/browse/{{ deployment.buildKey }}" rel="noopener noreferrer" target="_blank">
90-
{{ localdatetime(deployment.lastRenderedAt) }}
91-
</a>
92-
{% else %}
93-
{{ localdatetime(deployment.lastRenderedAt) }}
94-
{% endif %}
88+
{{ localdatetime(deployment.lastRenderedAt) }}
9589
</td>
9690
<td>
9791
{% if deployment.minimumTypoVersion == deployment.maximumTypoVersion %}

templates/docs_redirect/index.html.twig

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
</div>
130130
<div class="card-body">
131131
The static configuration file is always loaded <strong>before</strong> the dynamic configuration file.
132-
To change, create pull requests in <a href="https://bitbucket.typo3.com/projects/INT/repos/intercept/browse/config/nginx/redirects.conf">intecept</a>.
132+
To change, create pull requests in intercept.
133133
</div>
134134
<div class="card-footer">
135135
<div class="modal fade" id="staticConfiguration" tabindex="-1" role="dialog" aria-labelledby="staticConfigurationLabel" aria-hidden="true">
@@ -179,7 +179,11 @@
179179
{% endif %}
180180
</div>
181181
<div class="message-text">
182-
<a href="https://bamboo.typo3.com/browse/{{ log.bambooKey }}">Triggered bamboo Documentation Redirects</a>
182+
{% if log.link %}
183+
<a href="{{ log.link }}">Triggered redirects deployment</a>
184+
{% else %}
185+
{{ log.message }}
186+
{% endif %}
183187
</div>
184188
<div class="message-detail">
185189
{% if log.bambooKey %}

0 commit comments

Comments
 (0)