[PR #3847] [MERGED] v2.11.3 #3771

New issue

Closed

opened 2026-02-26 08:31:53 +03:00 by kerem · 0 comments

kerem commented

2026-02-26 08:31:53 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/NginxProxyManager/nginx-proxy-manager/pull/3847
Author: @jc21
Created: 7/1/2024
Status: ✅ Merged
Merged: 7/1/2024
Merged by: @jc21

Base: master ← Head: develop

📝 Commits (10+)

280bac8 advanced config move to top of default confg
516b4d9 Pin version as requested by dep
3ce477d add include for root_top.conf in the nginx.conf
b383f46 Merge pull request #3764 from ransbachm/develop
3754a56 Merge pull request #3729 from clhey/custom_proxy
ef23e79 update advanced config documentation
6ac9a82 Major update to cypress
bed387e Small fix for CI cleanup
d3a654b Fix flakey CI due to full stack network determination
e20a11d Remove spaces around cloudflare api credential

📊 Changes

43 files changed (+1454 additions, -1213 deletions)

View changed files

📝 .gitignore (+4 -0)
📝 .version (+1 -1)
📝 Jenkinsfile (+53 -70)
📝 README.md (+1 -2)
📝 backend/internal/certificate.js (+5 -8)
📝 backend/lib/config.js (+1 -1)
📝 backend/setup.js (+6 -3)
📝 backend/templates/_location.conf (+2 -3)
📝 backend/yarn.lock (+11 -11)
➕ docker/dev/dnsrouter-config.json (+28 -0)
➕ docker/dev/letsencrypt.ini (+7 -0)
➕ docker/dev/pdns-db.sql (+255 -0)
➕ docker/dev/pebble-config.json (+12 -0)
➕ docker/docker-compose.ci.mysql.yml (+27 -0)
➕ docker/docker-compose.ci.sqlite.yml (+9 -0)
📝 docker/docker-compose.ci.yml (+86 -67)
📝 docker/docker-compose.dev.yml (+0 -1)
➕ docker/rootfs/etc/nginx/conf.d/include/log.conf (+4 -0)
📝 docker/rootfs/etc/nginx/nginx.conf (+5 -4)
📝 docs/src/advanced-config/index.md (+10 -0)

...and 23 more files

📄 Description

No description provided

_{🔄 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/NginxProxyManager/nginx-proxy-manager/pull/3847 **Author:** [@jc21](https://github.com/jc21) **Created:** 7/1/2024 **Status:** ✅ Merged **Merged:** 7/1/2024 **Merged by:** [@jc21](https://github.com/jc21) **Base:** `master` ← **Head:** `develop` --- ### 📝 Commits (10+) - [`280bac8`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/280bac8b430a3465f1fbc4d7e8d94e148ad740e7) advanced config move to top of default confg - [`516b4d9`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/516b4d991c7f61566063c64cb4a366edf41ff818) Pin version as requested by dep - [`3ce477d`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/3ce477d35095d883047daa79bd6d722eddd3d00a) add include for `root_top.conf` in the nginx.conf - [`b383f46`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/b383f46656f13c4cba12dd1dd89fdedd90352bca) Merge pull request #3764 from ransbachm/develop - [`3754a56`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/3754a569ba6900afbb3995ae57ec93af3ce0a528) Merge pull request #3729 from clhey/custom_proxy - [`ef23e79`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/ef23e796ec1c8f161020ebac5a607194fd7f5cac) update advanced config documentation - [`6ac9a82`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/6ac9a82279c5a61ec8ecdb24d58912164e0d1530) Major update to cypress - [`bed387e`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/bed387ebd4fd34f1630bfc0f8840d4daffb467aa) Small fix for CI cleanup - [`d3a654b`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/d3a654b546f1c1b695aa9e2f290e9a72fa355e16) Fix flakey CI due to full stack network determination - [`e20a11d`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/e20a11de4aa20d40a7882ffd97672537f5681577) Remove spaces around cloudflare api credential ### 📊 Changes **43 files changed** (+1454 additions, -1213 deletions) <details> <summary>View changed files</summary> 📝 `.gitignore` (+4 -0) 📝 `.version` (+1 -1) 📝 `Jenkinsfile` (+53 -70) 📝 `README.md` (+1 -2) 📝 `backend/internal/certificate.js` (+5 -8) 📝 `backend/lib/config.js` (+1 -1) 📝 `backend/setup.js` (+6 -3) 📝 `backend/templates/_location.conf` (+2 -3) 📝 `backend/yarn.lock` (+11 -11) ➕ `docker/dev/dnsrouter-config.json` (+28 -0) ➕ `docker/dev/letsencrypt.ini` (+7 -0) ➕ `docker/dev/pdns-db.sql` (+255 -0) ➕ `docker/dev/pebble-config.json` (+12 -0) ➕ `docker/docker-compose.ci.mysql.yml` (+27 -0) ➕ `docker/docker-compose.ci.sqlite.yml` (+9 -0) 📝 `docker/docker-compose.ci.yml` (+86 -67) 📝 `docker/docker-compose.dev.yml` (+0 -1) ➕ `docker/rootfs/etc/nginx/conf.d/include/log.conf` (+4 -0) 📝 `docker/rootfs/etc/nginx/nginx.conf` (+5 -4) 📝 `docs/src/advanced-config/index.md` (+10 -0) _...and 23 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

kerem

2026-02-26 08:31:53 +03:00

closed this issue
added the
pull-request
label

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

starred/nginx-proxy-manager-NginxProxyManager#3771

No description provided.

Rows
Columns