Skip to content

Commit c4b874d

Browse files
lunnylunny
authored
Merge branch 'master' into add-test
2 parents ca6d180 + 4aabbac commit c4b874d

File tree

22 files changed

+78
-47
lines changed

22 files changed

+78
-47
lines changed

‎Makefile

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -389,15 +389,15 @@ generate-ini-sqlite:
389389

390390
.PHONY: test-sqlite
391391
test-sqlite: integrations.sqlite.test generate-ini-sqlite
392-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test
392+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test
393393

394394
.PHONY: test-sqlite\#%
395395
test-sqlite\#%: integrations.sqlite.test generate-ini-sqlite
396-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test -test.run $(subst .,/,$*)
396+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test -test.run $(subst .,/,$*)
397397

398398
.PHONY: test-sqlite-migration
399399
test-sqlite-migration: migrations.sqlite.test generate-ini-sqlite
400-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./migrations.sqlite.test
400+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/sqlite.ini ./migrations.sqlite.test
401401

402402
generate-ini-mysql:
403403
sed -e 's|{{TEST_MYSQL_HOST}}|${TEST_MYSQL_HOST}|g' \
@@ -409,15 +409,15 @@ generate-ini-mysql:
409409

410410
.PHONY: test-mysql
411411
test-mysql: integrations.mysql.test generate-ini-mysql
412-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test
412+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test
413413

414414
.PHONY: test-mysql\#%
415415
test-mysql\#%: integrations.mysql.test generate-ini-mysql
416-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test -test.run $(subst .,/,$*)
416+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test -test.run $(subst .,/,$*)
417417

418418
.PHONY: test-mysql-migration
419419
test-mysql-migration: migrations.mysql.test generate-ini-mysql
420-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./migrations.mysql.test
420+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql.ini ./migrations.mysql.test
421421

422422
generate-ini-mysql8:
423423
sed -e 's|{{TEST_MYSQL8_HOST}}|${TEST_MYSQL8_HOST}|g' \
@@ -429,15 +429,15 @@ generate-ini-mysql8:
429429

430430
.PHONY: test-mysql8
431431
test-mysql8: integrations.mysql8.test generate-ini-mysql8
432-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql8.ini ./integrations.mysql8.test
432+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql8.ini ./integrations.mysql8.test
433433

434434
.PHONY: test-mysql8\#%
435435
test-mysql8\#%: integrations.mysql8.test generate-ini-mysql8
436-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql8.ini ./integrations.mysql8.test -test.run $(subst .,/,$*)
436+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql8.ini ./integrations.mysql8.test -test.run $(subst .,/,$*)
437437

438438
.PHONY: test-mysql8-migration
439439
test-mysql8-migration: migrations.mysql8.test generate-ini-mysql8
440-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql8.ini ./migrations.mysql8.test
440+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql8.ini ./migrations.mysql8.test
441441

442442
generate-ini-pgsql:
443443
sed -e 's|{{TEST_PGSQL_HOST}}|${TEST_PGSQL_HOST}|g' \
@@ -450,15 +450,15 @@ generate-ini-pgsql:
450450

451451
.PHONY: test-pgsql
452452
test-pgsql: integrations.pgsql.test generate-ini-pgsql
453-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test
453+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test
454454

455455
.PHONY: test-pgsql\#%
456456
test-pgsql\#%: integrations.pgsql.test generate-ini-pgsql
457-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test -test.run $(subst .,/,$*)
457+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test -test.run $(subst .,/,$*)
458458

459459
.PHONY: test-pgsql-migration
460460
test-pgsql-migration: migrations.pgsql.test generate-ini-pgsql
461-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./migrations.pgsql.test
461+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/pgsql.ini ./migrations.pgsql.test
462462

463463
generate-ini-mssql:
464464
sed -e 's|{{TEST_MSSQL_HOST}}|${TEST_MSSQL_HOST}|g' \
@@ -470,35 +470,35 @@ generate-ini-mssql:
470470

471471
.PHONY: test-mssql
472472
test-mssql: integrations.mssql.test generate-ini-mssql
473-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mssql.ini ./integrations.mssql.test
473+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mssql.ini ./integrations.mssql.test
474474

475475
.PHONY: test-mssql\#%
476476
test-mssql\#%: integrations.mssql.test generate-ini-mssql
477-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mssql.ini ./integrations.mssql.test -test.run $(subst .,/,$*)
477+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mssql.ini ./integrations.mssql.test -test.run $(subst .,/,$*)
478478

479479
.PHONY: test-mssql-migration
480480
test-mssql-migration: migrations.mssql.test generate-ini-mssql
481-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mssql.ini ./migrations.mssql.test -test.failfast
481+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mssql.ini ./migrations.mssql.test -test.failfast
482482

483483
.PHONY: bench-sqlite
484484
bench-sqlite: integrations.sqlite.test generate-ini-sqlite
485-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
485+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
486486

487487
.PHONY: bench-mysql
488488
bench-mysql: integrations.mysql.test generate-ini-mysql
489-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
489+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
490490

491491
.PHONY: bench-mssql
492492
bench-mssql: integrations.mssql.test generate-ini-mssql
493-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mssql.ini ./integrations.mssql.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
493+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mssql.ini ./integrations.mssql.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
494494

495495
.PHONY: bench-pgsql
496496
bench-pgsql: integrations.pgsql.test generate-ini-pgsql
497-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
497+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
498498

499499
.PHONY: integration-test-coverage
500500
integration-test-coverage: integrations.cover.test generate-ini-mysql
501-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.cover.test -test.coverprofile=integration.coverage.out
501+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql.ini ./integrations.cover.test -test.coverprofile=integration.coverage.out
502502

503503
integrations.mysql.test: git-check $(GO_SOURCES)
504504
$(GO) test $(GOTESTFLAGS) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.mysql.test
@@ -699,7 +699,7 @@ generate-gitignore:
699699
.PHONY: generate-images
700700
generate-images:
701701
npm install --no-save --no-package-lock fabric imagemin-zopfli
702-
node build/generate-images.js
702+
node build/generate-images.js $(TAGS)
703703

704704
.PHONY: pr\#%
705705
pr\#%: clean-all
@@ -720,7 +720,7 @@ docker:
720720

721721
.PHONY: docker-build
722722
docker-build:
723-
docker run -ti --rm -v $(CURDIR):/srv/app/src/code.gitea.io/gitea -w /srv/app/src/code.gitea.io/gitea -e TAGS="bindata $(TAGS)" LDFLAGS="$(LDFLAGS)" CGO_EXTRA_CFLAGS="$(CGO_EXTRA_CFLAGS)" webhippie/golang:edge make clean build
723+
docker run -ti --rm -v "$(CURDIR):/srv/app/src/code.gitea.io/gitea" -w /srv/app/src/code.gitea.io/gitea -e TAGS="bindata $(TAGS)" LDFLAGS="$(LDFLAGS)" CGO_EXTRA_CFLAGS="$(CGO_EXTRA_CFLAGS)" webhippie/golang:edge make clean build
724724

725725
# This endif closes the if at the top of the file
726726
endif

‎build/generate-images.js

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ const {readFile, writeFile} = require('fs').promises;
77
const {resolve} = require('path');
88
const Svgo = require('svgo');
99

10+
const logoFile = resolve(__dirname, '../assets/logo.svg');
11+
1012
function exit(err) {
1113
if (err) console.error(err);
1214
process.exit(err ? 1 : 0);
@@ -39,6 +41,12 @@ async function generateSvgFavicon(svg, outputFile) {
3941
await writeFile(outputFile, data);
4042
}
4143

44+
async function generateSvg(svg, outputFile) {
45+
const svgo = new Svgo();
46+
const {data} = await svgo.optimize(svg);
47+
await writeFile(outputFile, data);
48+
}
49+
4250
async function generate(svg, outputFile, {size, bg}) {
4351
const {objects, options} = await loadSvg(svg);
4452
const canvas = new fabric.Canvas();
@@ -69,15 +77,26 @@ async function generate(svg, outputFile, {size, bg}) {
6977
}
7078

7179
async function main() {
72-
const svg = await readFile(resolve(__dirname, '../assets/logo.svg'), 'utf8');
73-
await generateSvgFavicon(svg, resolve(__dirname, '../public/img/favicon.svg'));
74-
await generate(svg, resolve(__dirname, '../public/img/gitea-lg.png'), {size: 880});
75-
await generate(svg, resolve(__dirname, '../public/img/gitea-512.png'), {size: 512});
76-
await generate(svg, resolve(__dirname, '../public/img/gitea-192.png'), {size: 192});
77-
await generate(svg, resolve(__dirname, '../public/img/gitea-sm.png'), {size: 120});
78-
await generate(svg, resolve(__dirname, '../public/img/avatar_default.png'), {size: 200});
79-
await generate(svg, resolve(__dirname, '../public/img/favicon.png'), {size: 180});
80-
await generate(svg, resolve(__dirname, '../public/img/apple-touch-icon.png'), {size: 180, bg: true});
80+
const gitea = process.argv.slice(2).includes('gitea');
81+
82+
const svg = await readFile(logoFile, 'utf8');
83+
await Promise.all([
84+
generateSvgFavicon(svg, resolve(__dirname, '../public/img/favicon.svg')),
85+
generateSvg(svg, resolve(__dirname, '../public/img/logo.svg')),
86+
generate(svg, resolve(__dirname, '../public/img/logo-lg.png'), {size: 880}),
87+
generate(svg, resolve(__dirname, '../public/img/logo-512.png'), {size: 512}),
88+
generate(svg, resolve(__dirname, '../public/img/logo-192.png'), {size: 192}),
89+
generate(svg, resolve(__dirname, '../public/img/logo-sm.png'), {size: 120}),
90+
generate(svg, resolve(__dirname, '../public/img/avatar_default.png'), {size: 200}),
91+
generate(svg, resolve(__dirname, '../public/img/favicon.png'), {size: 180}),
92+
generate(svg, resolve(__dirname, '../public/img/apple-touch-icon.png'), {size: 180, bg: true}),
93+
]);
94+
if (gitea) {
95+
await Promise.all([
96+
generateSvg(svg, resolve(__dirname, '../public/img/gitea.svg')),
97+
generate(svg, resolve(__dirname, '../public/img/gitea-192.png'), {size: 192}),
98+
]);
99+
}
81100
}
82101

83102
main().then(exit).catch(exit);

‎docs/content/doc/advanced/customizing-gitea.en-us.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ To make Gitea serve custom public files (like pages and images), use the folder
5757
For example, a file `image.png` stored in `custom/public/`, can be accessed with
5858
the url `http://gitea.domain.tld/image.png`.
5959

60+
## Changing the default logo
61+
62+
To automatically update custom logo png and svg files replace `assets/logo.svg` and run `make generate-images`. This will update the user-designated logo files served in `public/img`. Alternatively, you can manually update each `logo-X.png` and `logo.svg` file in `public/img`.
63+
6064
## Changing the default avatar
6165

6266
Place the png image at the following path: `custom/public/img/avatar_default.png`

‎docs/content/doc/developers/hacking-on-gitea.en-us.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,9 @@ SVG icons are built using the `make svg` target which compiles the icon sources
185185

186186
### Building the Logo
187187

188-
The PNG versions of the logo are built from a single SVG source file `assets/logo.svg` using the `make generate-images` target. To run it, Node.js and npm must be available. The same process can also be used to generate a custom logo PNGs from a SVG source file. It's possible to remove parts of the SVG logo for the favicon build by adding a `detail-remove` class to the SVG nodes to be removed.
188+
The PNG and SVG versions of the gitea logo are built from a single SVG source file `assets/logo.svg` using the `TAGS="gitea" make generate-images` target. To run it, Node.js and npm must be available.
189+
190+
The same process can also be used to generate custom logo PNGs from a SVG source file by updating `assets/logo.svg` and running `make generate-images`. Omitting the `gitea` tag will update only the user-designated logo files.
189191

190192
### Updating the API
191193

‎public/img/gitea.svg

Lines changed: 1 addition & 0 deletions
Loading

‎public/img/logo-192.png

4.64 KB
Loading

‎public/img/gitea-512.png renamed to ‎public/img/logo-512.png

File renamed without changes.

‎public/img/gitea-lg.png renamed to ‎public/img/logo-lg.png

File renamed without changes.

‎public/img/gitea-safari.svg renamed to ‎public/img/logo-safari.svg

File renamed without changes.

‎public/img/gitea-sm.png renamed to ‎public/img/logo-sm.png

File renamed without changes.

‎public/img/logo.svg

Lines changed: 1 addition & 0 deletions
Loading

‎snap/snapcraft.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: |
66
an independent binary distribution across ALL platforms that Go supports,
77
including Linux, Mac OS X, Windows and ARM.
88
9-
icon: public/img/gitea-lg.png
9+
icon: public/img/logo-lg.png
1010
confinement: strict
1111
base: core18
1212
adopt-info: gitea

‎templates/admin/hook_new.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
{{end}}
1212
<div class="ui right">
1313
{{if eq .HookType "gitea"}}
14-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/gitea-sm.png">
14+
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/gitea.svg">
1515
{{else if eq .HookType "gogs"}}
1616
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/gogs.ico">
1717
{{else if eq .HookType "slack"}}

‎templates/base/head.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
</script>
6161
<link rel="icon" href="{{StaticUrlPrefix}}/img/favicon.svg" type="image/svg+xml">
6262
<link rel="alternate icon" href="{{StaticUrlPrefix}}/img/favicon.png" type="image/png">
63-
<link rel="mask-icon" href="{{StaticUrlPrefix}}/img/gitea-safari.svg" color="#609926">
64-
<link rel="fluid-icon" href="{{StaticUrlPrefix}}/img/gitea-lg.png" title="{{AppName}}">
63+
<link rel="mask-icon" href="{{StaticUrlPrefix}}/img/logo-safari.svg" color="#609926">
64+
<link rel="fluid-icon" href="{{StaticUrlPrefix}}/img/logo-lg.png" title="{{AppName}}">
6565
{{if .RequireSimpleMDE}}
6666
<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/easymde.css?v={{MD5 AppVer}}">
6767
{{end}}
@@ -104,7 +104,7 @@
104104
{{else}}
105105
<meta property="og:title" content="{{AppName}}">
106106
<meta property="og:type" content="website" />
107-
<meta property="og:image" content="{{StaticUrlPrefix}}/img/gitea-lg.png" />
107+
<meta property="og:image" content="{{StaticUrlPrefix}}/img/logo-lg.png" />
108108
<meta property="og:url" content="{{AppUrl}}" />
109109
<meta property="og:description" content="{{MetaDescription}}">
110110
{{end}}

‎templates/base/head_navbar.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="ui container" id="navbar">
22
<div class="item brand" style="justify-content: space-between;">
33
<a href="{{AppSubUrl}}/">
4-
<img class="ui mini image" src="{{StaticUrlPrefix}}/img/gitea-sm.png">
4+
<img class="ui mini image" src="{{StaticUrlPrefix}}/img/logo.svg">
55
</a>
66
<div class="ui basic icon button mobile-only" id="navbar-expand-toggle">
77
<i class="sidebar icon"></i>

‎templates/home.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="ui stackable middle very relaxed page grid">
44
<div class="sixteen wide center aligned centered column">
55
<div>
6-
<img class="logo" src="{{StaticUrlPrefix}}/img/gitea-lg.png" />
6+
<img class="logo" src="{{StaticUrlPrefix}}/img/logo.svg" />
77
</div>
88
<div class="hero">
99
<h1 class="ui icon header title">

‎templates/org/settings/hook_new.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}}
1111
<div class="ui right">
1212
{{if eq .HookType "gitea"}}
13-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/gitea-sm.png">
13+
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/gitea.svg">
1414
{{else if eq .HookType "gogs"}}
1515
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/gogs.ico">
1616
{{else if eq .HookType "slack"}}

‎templates/pwa/manifest_json.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
"name": "Gitea - Git with a cup of tea",
44
"icons": [
55
{
6-
"src": "{{StaticUrlPrefix}}/img/gitea-lg.png",
6+
"src": "{{StaticUrlPrefix}}/img/logo-lg.png",
77
"type": "image/png",
88
"sizes": "880x880"
99
},
1010
{
11-
"src": "{{StaticUrlPrefix}}/img/gitea-sm.png",
11+
"src": "{{StaticUrlPrefix}}/img/logo-sm.png",
1212
"type": "image/png",
1313
"sizes": "120x120"
1414
},
1515
{
16-
"src": "{{StaticUrlPrefix}}/img/gitea-512.png",
16+
"src": "{{StaticUrlPrefix}}/img/logo-512.png",
1717
"type": "image/png",
1818
"sizes": "512x512"
1919
},
2020
{
21-
"src": "{{StaticUrlPrefix}}/img/gitea-192.png",
21+
"src": "{{StaticUrlPrefix}}/img/logo-192.png",
2222
"type": "image/png",
2323
"sizes": "192x192"
2424
}

‎templates/repo/issue/view_content/pull.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@
343343
</span>
344344
</button>
345345
{{if gt $prUnit.PullRequestsConfig.AllowedMergeStyleCount 1}}
346-
<div class="ui dropdown icon button">
346+
<div class="ui dropdown icon button no-text">
347347
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
348348
<div class="menu">
349349
{{if $prUnit.PullRequestsConfig.AllowMerge}}

0 commit comments

Comments
 (0)