Skip to content

Commit 81e06f5

Browse files
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents 0ec47b5 + b84d7cf commit 81e06f5

5 files changed

Lines changed: 50 additions & 53 deletions

File tree

config/dynamic/provider/git/git.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"time"
1616

1717
"github.com/go-git/go-git/v5"
18-
"github.com/go-git/go-git/v5/config"
1918
"github.com/go-git/go-git/v5/plumbing"
2019
"github.com/go-git/go-git/v5/plumbing/transport/client"
2120
"github.com/go-git/go-git/v5/plumbing/transport/http"
@@ -271,9 +270,9 @@ func pull(r *repository) {
271270
if r.repo == nil {
272271
return
273272
}
274-
err := r.repo.Fetch(&git.FetchOptions{RefSpecs: []config.RefSpec{"refs/*:refs/*", "HEAD:refs/heads/HEAD"}})
273+
err := r.repo.Fetch(&git.FetchOptions{})
275274
if errors.Is(err, git.ErrForceNeeded) {
276-
err = r.repo.Fetch(&git.FetchOptions{RefSpecs: []config.RefSpec{"+refs/*:refs/*", "HEAD:refs/heads/HEAD"}})
275+
err = r.repo.Fetch(&git.FetchOptions{})
277276
}
278277
if err != nil {
279278
if !errors.Is(err, git.NoErrAlreadyUpToDate) {

docs/get-started/dashboard.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,14 @@ You can find the OpenAPI specification of these endpoints
106106
| Path | Description |
107107
|-----------------------------------|----------------------------------------|
108108
| /api/info | get information about mokapi's runtime |
109-
| /api/services | list of all services |
110-
| /api/services/http/{name} | Information about the http service |
111-
| /api/services/kafka/{name} | Information about the kafka cluster |
112-
| /api/services/mail/{name} | Information about the smtp server |
113-
| /api/services/kafka/{name}/groups | list of kafka groups |
114-
| /api/events | list of events |
115-
| /api/events/{id} | get event by id |
116-
| /api/metrics | get list of metrics |
117-
| /api/schema/example | returns example for given schema |
109+
| /api/services | list of all services |
110+
| /api/services/http/{name} | Information about the http service |
111+
| /api/services/kafka/{name} | Information about the kafka cluster |
112+
| /api/services/mail/{name} | Information about the smtp server |
113+
| /api/services/kafka/{name}/groups | list of kafka groups |
114+
| /api/events | list of events |
115+
| /api/events/{id} | get event by id |
116+
| /api/metrics | get list of metrics |
117+
| /api/schema/example | returns example for given schema |
118+
| /health/live | |
119+
| /health/ready | |

runtime/index.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -353,10 +353,6 @@ func getTypeFacet(term *bleveSearch.TermFacet) search.FacetValue {
353353
}
354354

355355
func getSearchIndexPath(cfg static.Search) string {
356-
if cfg.InMemory {
357-
return ""
358-
}
359-
360356
indexPath := cfg.IndexPath
361357
if indexPath == "" {
362358
indexPath = os.TempDir()

webui/package-lock.json

Lines changed: 33 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webui/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@types/bootstrap": "^5.2.10",
2323
"@types/mokapi": "^0.34.0",
2424
"@types/nodemailer": "^7.0.10",
25-
"@types/whatwg-mimetype": "^3.0.2",
25+
"@types/whatwg-mimetype": "^5.0.0",
2626
"ace-builds": "^1.43.5",
2727
"bootstrap": "^5.3.8",
2828
"bootstrap-icons": "^1.13.1",
@@ -40,7 +40,7 @@
4040
"ncp": "^2.0.0",
4141
"nodemailer": "^8.0.1",
4242
"vue": "^3.5.28",
43-
"vue-router": "^5.0.2",
43+
"vue-router": "^5.0.3",
4444
"vue3-ace-editor": "^2.2.4",
4545
"vue3-highlightjs": "^1.0.5",
4646
"vue3-markdown-it": "^1.0.10",
@@ -52,13 +52,13 @@
5252
"@rushstack/eslint-patch": "^1.16.1",
5353
"@types/js-yaml": "^4.0.9",
5454
"@types/markdown-it-container": "^4.0.0",
55-
"@types/node": "^25.2.3",
55+
"@types/node": "^25.3.2",
5656
"@vitejs/plugin-vue": "^6.0.4",
5757
"@vue/eslint-config-prettier": "^10.2.0",
5858
"@vue/eslint-config-typescript": "^14.7.0",
5959
"@vue/tsconfig": "^0.8.1",
6060
"eslint": "^9.39.2",
61-
"eslint-plugin-vue": "^10.6.2",
61+
"eslint-plugin-vue": "^10.8.0",
6262
"npm-run-all": "^4.1.5",
6363
"prettier": "^3.8.1",
6464
"typescript": "~5.9.3",

0 commit comments

Comments
 (0)