Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
pounced-on.me
mastodon
Commits
0e661dd2
Commit
0e661dd2
authored
6 years ago
by
Yamagishi Kazutoshi
Committed by
Eugen Rochko
6 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Fix static URL when disable autoplay (#8548)
parent
08721170
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/views/stream_entries/_detailed_status.html.haml
+2
-2
app/views/stream_entries/_detailed_status.html.haml
app/views/stream_entries/_simple_status.html.haml
+2
-2
app/views/stream_entries/_simple_status.html.haml
with
4 additions
and
4 deletions
+4
-4
app/views/stream_entries/_detailed_status.html.haml
+
2
-
2
View file @
0e661dd2
...
...
@@ -2,9 +2,9 @@
=
link_to
TagManager
.
instance
.
url_for
(
status
.
account
),
class:
'detailed-status__display-name p-author h-card'
,
target:
stream_link_target
,
rel:
'noopener'
do
.detailed-status__display-avatar
-
if
current_account
&
.
user
&
.
setting_auto_play_gif
||
autoplay
=
image_tag
status
.
account
.
avatar
.
url
(
:
original
)
,
width:
48
,
height:
48
,
alt:
''
,
class:
'account__avatar u-photo'
=
image_tag
status
.
account
.
avatar
_
original
_url
,
width:
48
,
height:
48
,
alt:
''
,
class:
'account__avatar u-photo'
-
else
=
image_tag
status
.
account
.
avatar
.
url
(
:
static
)
,
width:
48
,
height:
48
,
alt:
''
,
class:
'account__avatar u-photo'
=
image_tag
status
.
account
.
avatar
_
static
_url
,
width:
48
,
height:
48
,
alt:
''
,
class:
'account__avatar u-photo'
%span
.display-name
%bdi
%strong
.display-name__html.p-name.emojify
=
display_name
(
status
.
account
,
custom_emojify:
true
,
autoplay:
autoplay
)
...
...
This diff is collapsed.
Click to expand it.
app/views/stream_entries/_simple_status.html.haml
+
2
-
2
View file @
0e661dd2
...
...
@@ -8,9 +8,9 @@
.status__avatar
%div
-
if
current_account
&
.
user
&
.
setting_auto_play_gif
||
autoplay
=
image_tag
status
.
account
.
avatar
(
:
original
)
,
width:
48
,
height:
48
,
alt:
''
,
class:
'u-photo account__avatar'
=
image_tag
status
.
account
.
avatar
_
original
_url
,
width:
48
,
height:
48
,
alt:
''
,
class:
'u-photo account__avatar'
-
else
=
image_tag
status
.
account
.
avatar
(
:
static
)
,
width:
48
,
height:
48
,
alt:
''
,
class:
'u-photo account__avatar'
=
image_tag
status
.
account
.
avatar
_
static
_url
,
width:
48
,
height:
48
,
alt:
''
,
class:
'u-photo account__avatar'
%span
.display-name
%bdi
%strong
.display-name__html.p-name.emojify
=
display_name
(
status
.
account
,
custom_emojify:
true
,
autoplay:
autoplay
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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