Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
circlestack
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
c1d44817
authored
Sep 24, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: fix extra whitespace after merge activity text
parent
986920ab
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
+2
-1
circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
+2
-1
No files found.
circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
View file @
c1d44817
...
...
@@ -7,6 +7,7 @@
<span
class=
"timeline-icon{% if a.has_failed %} timeline-icon-failed{% endif %}"
>
<i
class=
"fa {% if not a.finished %}fa-refresh fa-spin {% else %}fa-{{a.icon}}{% endif %}"
></i>
</span>
{% spaceless %}
<strong
{%
if
a
.
result
%}
title=
"{{ a.result|get_text:user }}"
{%
endif
%}
>
<a
href=
"{{ a.get_absolute_url }}"
>
{% if a.times > 1 %}({{ a.times }}x){% endif %}
...
...
@@ -16,7 +17,7 @@
- {{ a.percentage }}%
{% endif %}
</strong>
{%
if a.times
<
2
%}
{{
a
.
started
|
date:
"
Y-m-d
H:i
"
}}{%
endif
%}{%
if
a
.
user
%},
{%
endspaceless %}{% if a.times
<
2
%}
{{
a
.
started
|
date:
"
Y-m-d
H:i
"
}}{%
endif
%}{%
if
a
.
user
%},
<
a
class=
"no-style-link"
href=
"{% url "
dashboard
.
views
.
profile
"
username=
a.user.username
%}"
>
{% include "dashboard/_display-name.html" with user=a.user show_org=True %}
</a>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment