Skip to content
GitLab
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Commits on Source (2)
[Sprint/HipsterHedgehog] (feat): added gif flag to activities
· 06de63d2
Marcelo Rivera
authored
Jul 03, 2019
and
Mark Harding
committed
Jul 03, 2019
06de63d2
Merge branch 'feat/add-gif-flag-to-activities' into 'master'
· 7aa33c33
Mark Harding
authored
Jul 03, 2019
[Sprint/HipsterHedgehog] (feat): added gif flag to activities Closes
#544
See merge request
!240
7aa33c33
Hide whitespace changes
Inline
Side-by-side
Controllers/api/v1/newsfeed.php
View file @
7aa33c33
...
...
@@ -394,6 +394,7 @@ class newsfeed implements Interfaces\Api
'mature'
=>
$embeded
instanceof
Flaggable
?
$embeded
->
getFlag
(
'mature'
)
:
false
,
'width'
=>
$embeded
->
width
,
'height'
=>
$embeded
->
height
,
'gif'
=>
(
bool
)
$embeded
->
gif
??
false
,
]])
->
setMature
(
$embeded
instanceof
Flaggable
?
$embeded
->
getFlag
(
'mature'
)
:
false
)
->
setFromEntity
(
$embeded
)
...
...
@@ -410,6 +411,7 @@ class newsfeed implements Interfaces\Api
'mature'
=>
$embeded
instanceof
Flaggable
?
$embeded
->
getFlag
(
'mature'
)
:
false
,
'width'
=>
$embeded
->
width
,
'height'
=>
$embeded
->
height
,
'gif'
=>
(
bool
)
$embeded
->
gif
??
false
,
]])
->
setMature
(
$embeded
instanceof
Flaggable
?
$embeded
->
getFlag
(
'mature'
)
:
false
)
->
setFromEntity
(
$embeded
)
...
...
@@ -606,6 +608,7 @@ class newsfeed implements Interfaces\Api
'mature'
=>
$attachment
instanceof
Flaggable
?
$attachment
->
getFlag
(
'mature'
)
:
false
,
'width'
=>
$attachment
->
width
,
'height'
=>
$attachment
->
height
,
'gif'
=>
(
bool
)
$attachment
->
gif
??
false
,
]])
->
setFromEntity
(
$attachment
)
->
setTitle
(
$attachment
->
message
);
...
...