Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Sharkey
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dima Krasner
Sharkey
Commits
73d735a1
Commit
73d735a1
authored
2 years ago
by
tamaina
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' of
https://github.com/misskey-dev/misskey
into develop
parents
b8b1899a
d52f0617
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
packages/backend/src/server/api/endpoints/drive/files/create.ts
+4
-4
4 additions, 4 deletions
...es/backend/src/server/api/endpoints/drive/files/create.ts
with
5 additions
and
4 deletions
CHANGELOG.md
+
1
−
0
View file @
73d735a1
...
...
@@ -133,6 +133,7 @@ You should also include the user name that made the change.
-
Server: 非公開のクリップのURLでOGPレンダリングされる問題を修正 @syuilo
-
Server: アンテナタイムライン(ストリーミング)が、フォローしていないユーザーの鍵投稿も拾ってしまう @syuilo
-
Server: follow request list api pagination @sim1222
-
Server: ドライブ容量超過時のエラーが適切にレスポンスされない問題を修正 @syuilo
-
Client: パスワードマネージャーなどでユーザー名がオートコンプリートされない問題を修正 @massongit
-
Client: 日付形式の文字列などがカスタム絵文字として表示されるのを修正 @syuilo
-
Client: case insensitive emoji search @saschanaz
...
...
This diff is collapsed.
Click to expand it.
packages/backend/src/server/api/endpoints/drive/files/create.ts
+
4
−
4
View file @
73d735a1
...
...
@@ -90,7 +90,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
}
}
const
meta
=
await
this
.
metaService
.
fetch
();
const
instance
=
await
this
.
metaService
.
fetch
();
try
{
// Create file
...
...
@@ -102,8 +102,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
folderId
:
ps
.
folderId
,
force
:
ps
.
force
,
sensitive
:
ps
.
isSensitive
,
requestIp
:
meta
.
enableIpLogging
?
ip
:
null
,
requestHeaders
:
meta
.
enableIpLogging
?
headers
:
null
,
requestIp
:
instance
.
enableIpLogging
?
ip
:
null
,
requestHeaders
:
instance
.
enableIpLogging
?
headers
:
null
,
});
return
await
this
.
driveFileEntityService
.
pack
(
driveFile
,
{
self
:
true
});
}
catch
(
err
)
{
...
...
@@ -116,7 +116,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
}
throw
new
ApiError
();
}
finally
{
cleanup
!
();
cleanup
!
();
}
});
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment