Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Dokumentation zum Föd. Entwicklungsportal - ARCHIVED
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
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
FIT-Connect
Dokumentation zum Föd. Entwicklungsportal - ARCHIVED
Commits
b9a590b7
Commit
b9a590b7
authored
2 years ago
by
Mark Kane
Browse files
Options
Downloads
Plain Diff
Merge branch 'main' into 'renovate/trim-1.x'
# Conflicts: # package.json
parents
6913fe2d
bb87f40d
No related branches found
Branches containing commit
No related tags found
1 merge request
!10
chore(deps): update dependency trim to v1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
package.json
+1
-1
1 addition, 1 deletion
package.json
yarn.lock
+9
-15
9 additions, 15 deletions
yarn.lock
with
10 additions
and
16 deletions
package.json
+
1
−
1
View file @
b9a590b7
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
},
},
"resolutions"
:
{
"resolutions"
:
{
"loader-utils"
:
"^2.0.4"
,
"loader-utils"
:
"^2.0.4"
,
"minimatch"
:
"^
3
.0.
5
"
,
"minimatch"
:
"^
5
.0.
0
"
,
"trim"
:
"^1.0.0"
,
"trim"
:
"^1.0.0"
,
"got"
:
"^11.8.5"
"got"
:
"^11.8.5"
},
},
...
...
This diff is collapsed.
Click to expand it.
yarn.lock
+
9
−
15
View file @
b9a590b7
...
@@ -2819,13 +2819,12 @@ boxen@^6.2.1:
...
@@ -2819,13 +2819,12 @@ boxen@^6.2.1:
widest-line "^4.0.1"
widest-line "^4.0.1"
wrap-ansi "^8.0.1"
wrap-ansi "^8.0.1"
brace-expansion@^
1.1.7
:
brace-expansion@^
2.0.1
:
version "
1.1.1
1"
version "
2.0.
1"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-
1.1
.1
1
.tgz#
3c7fcbf529d87226f3d2f52b966ff5271eb441dd
"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-
2.0
.1.tgz#
1edc459e0f0c548486ecf9fc99f2221364b9a0ae
"
integrity sha512-
iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGi
A==
integrity sha512-
XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytD
A==
dependencies:
dependencies:
balanced-match "^1.0.0"
balanced-match "^1.0.0"
concat-map "0.0.1"
braces@^3.0.2, braces@~3.0.2:
braces@^3.0.2, braces@~3.0.2:
version "3.0.2"
version "3.0.2"
...
@@ -3194,11 +3193,6 @@ compression@^1.7.4:
...
@@ -3194,11 +3193,6 @@ compression@^1.7.4:
safe-buffer "5.1.2"
safe-buffer "5.1.2"
vary "~1.1.2"
vary "~1.1.2"
concat-map@0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
configstore@^5.0.1:
configstore@^5.0.1:
version "5.0.1"
version "5.0.1"
resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
...
@@ -5408,12 +5402,12 @@ minimalistic-assert@^1.0.0:
...
@@ -5408,12 +5402,12 @@ minimalistic-assert@^1.0.0:
resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
minimatch@3.0.4, minimatch@^3.0.4, minimatch@^3.
0.5
, minimatch@^
3.1.1
:
minimatch@3.0.4, minimatch@^3.0.4, minimatch@^3.
1.1
, minimatch@^
5.0.0
:
version "
3
.1.
2
"
version "
5
.1.
1
"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-
3
.1.
2
.tgz#
19cd194bfd3e428f049a70817c038d89ab4be35b
"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-
5
.1.
1
.tgz#
6c9dffcf9927ff2a31e74b5af11adf8b9604b022
"
integrity sha512-
J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw
==
integrity sha512-
362NP+zlprccbEt/SkxKfRMHnNY85V74mVnpUpNyr3F35covl09Kec7/sEFLt3RA4oXmewtoaanoIf67SE5Y5g
==
dependencies:
dependencies:
brace-expansion "^
1.1.7
"
brace-expansion "^
2.0.1
"
minimist@^1.2.0, minimist@^1.2.5:
minimist@^1.2.0, minimist@^1.2.5:
version "1.2.7"
version "1.2.7"
...
...
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