Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
docker-template-repo
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
JetBrains YouTrack
External 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
Prosper
docker-template-repo
Commits
2c790e45
Commit
2c790e45
authored
2 years ago
by
Griefed
Browse files
Options
Downloads
Plain Diff
Merge branch 'main' into 'renovate-org.apache.logging.log4j-log4j-slf4j-
impl-2
.x'
# Conflicts: # build.gradle
parents
faf6948f
fc541cce
No related branches found
Branches containing commit
No related tags found
1 merge request
!140
Update dependency org.apache.logging.log4j:log4j-slf4j-impl to v2.18.0
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.github/workflows/test.yml
+2
-2
2 additions, 2 deletions
.github/workflows/test.yml
build.gradle
+2
-2
2 additions, 2 deletions
build.gradle
frontend/package-lock.json
+316
-191
316 additions, 191 deletions
frontend/package-lock.json
frontend/package.json
+5
-5
5 additions, 5 deletions
frontend/package.json
with
325 additions
and
200 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