Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Nextcloud
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Nextcloud
Commits
64aba494
Unverified
Commit
64aba494
authored
5 years ago
by
Daniel Kesselberg
Browse files
Options
Downloads
Patches
Plain Diff
Ensure that we don't merge broken json.
Signed-off-by:
Daniel Kesselberg
<
mail@danielkesselberg.de
>
parent
8bc4295c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
Loading
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
lib/private/Files/Type/Detection.php
+25
-6
25 additions, 6 deletions
lib/private/Files/Type/Detection.php
lib/private/Server.php
+1
-0
1 addition, 0 deletions
lib/private/Server.php
tests/lib/Files/Type/DetectionTest.php
+14
-8
14 additions, 8 deletions
tests/lib/Files/Type/DetectionTest.php
with
40 additions
and
14 deletions
Loading
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
Daniel Kesselberg <mail@danielkesselberg.de>Daniel Kesselberg <mail@danielkesselberg.de>