[PR #855] [MERGED] fix - removed package-lock.json from .gitignore #858

New Issue

GiteaMirror · 2025-11-13T12:12:32-06:00

GiteaMirror commented

2025-11-13 12:12:32 -06:00

📋 Pull Request Information

Original PR: https://github.com/fosrl/pangolin/pull/855
Author: @Lokowitz
Created: 6/6/2025
Status: ✅ Merged
Merged: 6/6/2025
Merged by: @oschwartz10612

Base: main ← Head: main

📝 Commits (1)

553dffd removed package-lock.json from .gitignore

📊 Changes

2 files changed (+13791 additions, -13792 deletions)

View changed files

📝 .gitignore (+1 -2)
📝 package-lock.json (+13790 -13790)

📄 Description

Community Contribution License Agreement

By creating this pull request, I grant the project maintainers an unlimited,
perpetual license to use, modify, and redistribute these contributions under any terms they
choose, including both the AGPLv3 and the Fossorial Commercial license terms. I
represent that I have the right to grant this license for all contributed content.

Description

Removed package-lock.json from .gitignore because it is not recommended.
Recreated package-lock.json to avoid errors with dependabot because dependabot is not working properly without.

https://stackoverflow.com/questions/44206782/do-i-commit-the-package-lock-json-file-created-by-npm-5

I saw your merging conflict yesterday and i think this was the reason you added it to ignore?
I know the pain then updating deps and getting merging errors. Thats the reason i only update deps in the main branch and then merge it back to the other branches.

The problem you had was because i updated some deps in my PR against dev and you updated some deps at the same time in the main. If you still want to use dev as your main PR target i think you should update the deps directly into dev or into main and then merge it directly back to dev.

Have a nice day,
Marvin

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/fosrl/pangolin/pull/855 **Author:** [@Lokowitz](https://github.com/Lokowitz) **Created:** 6/6/2025 **Status:** ✅ Merged **Merged:** 6/6/2025 **Merged by:** [@oschwartz10612](https://github.com/oschwartz10612) **Base:** `main` ← **Head:** `main` --- ### 📝 Commits (1) - [`553dffd`](https://github.com/fosrl/pangolin/commit/553dffd4eea5ee14df6cd95f9b66a6c113d965b5) removed package-lock.json from .gitignore ### 📊 Changes **2 files changed** (+13791 additions, -13792 deletions) <details> <summary>View changed files</summary> 📝 `.gitignore` (+1 -2) 📝 `package-lock.json` (+13790 -13790) </details> ### 📄 Description ## Community Contribution License Agreement By creating this pull request, I grant the project maintainers an unlimited, perpetual license to use, modify, and redistribute these contributions under any terms they choose, including both the AGPLv3 and the Fossorial Commercial license terms. I represent that I have the right to grant this license for all contributed content. ## Description Removed package-lock.json from .gitignore because it is not recommended. Recreated package-lock.json to avoid errors with dependabot because dependabot is not working properly without. https://stackoverflow.com/questions/44206782/do-i-commit-the-package-lock-json-file-created-by-npm-5 I saw your merging conflict yesterday and i think this was the reason you added it to ignore? I know the pain then updating deps and getting merging errors. Thats the reason i only update deps in the main branch and then merge it back to the other branches. The problem you had was because i updated some deps in my PR against `dev` and you updated some deps at the same time in the `main`. If you still want to use `dev` as your main PR target i think you should update the deps directly into `dev` or into `main` and then merge it directly back to `dev`. Have a nice day, Marvin --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

GiteaMirror added the pull-request label 2025-11-13 12:12:32 -06:00

GiteaMirror closed this issue

2025-11-13 12:12:32 -06:00

GiteaMirror referenced this issue

2026-04-16 08:24:14 -05:00

[GH-ISSUE #858] Add option to auto redirect, when using external idp #1669

GiteaMirror referenced this issue

2026-04-20 07:38:14 -05:00

[GH-ISSUE #858] Add option to auto redirect, when using external idp #3611

GiteaMirror referenced this issue

2026-04-25 15:21:21 -05:00

[GH-ISSUE #858] Add option to auto redirect, when using external idp #6465