Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Framasoft
PeerTube
PeerTube
Commits
2b621ac0
Verified
Commit
2b621ac0
authored
Jun 21, 2022
by
Chocobozzz
Browse files
Merge branch 'release/4.2.0' into develop
parents
a3d15b64
494081f8
Changes
3
Hide whitespace changes
Inline
Side-by-side
CHANGELOG.md
View file @
2b621ac0
...
...
@@ -22,6 +22,8 @@
*
Fix incorrect instance stats
*
Fix broken player on ICE error
*
Relax views federation
*
Fix peertube user in docker
*
Fix playlist element federation with a deleted video
## v4.2.0
...
...
server/models/video/video-playlist-element.ts
View file @
2b621ac0
...
...
@@ -351,7 +351,7 @@ export class VideoPlaylistElementModel extends Model<Partial<AttributesOnly<Vide
id
:
this
.
url
,
type
:
'
PlaylistElement
'
,
url
:
this
.
Video
.
url
,
url
:
this
.
Video
?
.
url
||
null
,
position
:
this
.
position
}
...
...
support/docker/production/entrypoint.sh
View file @
2b621ac0
...
...
@@ -7,11 +7,11 @@ find /config ! -user peertube -exec chown peertube:peertube {} \; || true
# first arg is `-f` or `--some-option`
# or first arg is `something.conf`
if
[
"
${
1
#-
}
"
!=
"
$1
"
]
||
[
"
${
1
%.conf
}
"
!=
"
$1
"
]
;
then
set
--
n
pm
"
$@
"
set
--
n
ode
"
$@
"
fi
# allow the container to be started with `--user`
if
[
"
$1
"
=
'n
pm
'
-a
"
$(
id
-u
)
"
=
'0'
]
;
then
if
[
"
$1
"
=
'n
ode
'
-a
"
$(
id
-u
)
"
=
'0'
]
;
then
find /data
!
-user
peertube
-exec
chown
peertube:peertube
{}
\;
exec
gosu peertube
"
$0
"
"
$@
"
fi
...
...
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