From b0afde6d64c6ad7fe63ba68c718b15ffb90aa2be Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Wed, 22 Nov 2023 17:12:37 +0100 Subject: [PATCH] Revert "[BRANDING] Replace branding in Swagger" This reverts commit 07fbe2ba6924f0462f426e8f925f7b7191c6aa80. --- Makefile | 2 -- templates/swagger/ui.tmpl | 2 +- templates/swagger/v1_json.tmpl | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 46531481bb..3051e0f511 100644 --- a/Makefile +++ b/Makefile @@ -150,7 +150,6 @@ SWAGGER_SPEC_S_TMPL := s|"basePath": *"/api/v1"|"basePath": "{{AppSubUrl \| JSEs SWAGGER_SPEC_S_JSON := s|"basePath": *"{{AppSubUrl \| JSEscape \| Safe}}/api/v1"|"basePath": "/api/v1"|g SWAGGER_EXCLUDE := code.gitea.io/sdk SWAGGER_NEWLINE_COMMAND := -e '$$a\' -SWAGGER_SPEC_BRANDING := s|Gitea API|Forgejo API|g TEST_MYSQL_HOST ?= mysql:3306 TEST_MYSQL_DBNAME ?= testgitea @@ -341,7 +340,6 @@ $(SWAGGER_SPEC): $(GO_SOURCES_NO_BINDATA) $(GO) run $(SWAGGER_PACKAGE) generate spec -x "$(SWAGGER_EXCLUDE)" -o './$(SWAGGER_SPEC)' $(SED_INPLACE) '$(SWAGGER_SPEC_S_TMPL)' './$(SWAGGER_SPEC)' $(SED_INPLACE) $(SWAGGER_NEWLINE_COMMAND) './$(SWAGGER_SPEC)' - $(SED_INPLACE) '$(SWAGGER_SPEC_BRANDING)' './$(SWAGGER_SPEC)' .PHONY: swagger-check swagger-check: generate-swagger diff --git a/templates/swagger/ui.tmpl b/templates/swagger/ui.tmpl index bcdc96c54f..9935ab9c5a 100644 --- a/templates/swagger/ui.tmpl +++ b/templates/swagger/ui.tmpl @@ -1,7 +1,7 @@ - Forgejo API + Gitea API diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 55f8989563..02dec64e78 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -13,8 +13,8 @@ ], "swagger": "2.0", "info": { - "description": "This documentation describes the Forgejo API.", - "title": "Forgejo API.", + "description": "This documentation describes the Gitea API.", + "title": "Gitea API.", "license": { "name": "MIT", "url": "http://opensource.org/licenses/MIT"