Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Pierre Boudes
mastodon
Commits
e0eb39d4
Unverified
Commit
e0eb39d4
authored
2 years ago
by
Claire
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix bookmark import stopping at the first failure (#19669)
Fixes #19389
parent
e9141843
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/services/import_service.rb
+5
-0
5 additions, 0 deletions
app/services/import_service.rb
with
5 additions
and
0 deletions
app/services/import_service.rb
+
5
−
0
View file @
e0eb39d4
...
...
@@ -112,6 +112,11 @@ class ImportService < BaseService
next
if
status
.
nil?
&&
ActivityPub
::
TagManager
.
instance
.
local_uri?
(
uri
)
status
||
ActivityPub
::
FetchRemoteStatusService
.
new
.
call
(
uri
)
rescue
HTTP
::
Error
,
OpenSSL
::
SSL
::
SSLError
,
Mastodon
::
UnexpectedResponseError
nil
rescue
StandardError
=>
e
Rails
.
logger
.
warn
"Unexpected error when importing bookmark:
#{
e
}
"
nil
end
account_ids
=
statuses
.
map
(
&
:account_id
)
...
...
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