Skip to content

Commit 835165e

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Fix page and missing return on unadopted repos API (go-gitea#18848) [skip ci] Updated licenses and gitignores Allow adminstrator teams members to see other teams (go-gitea#18918) Update nginx reverse proxy docs (go-gitea#18922) Don't treat BOM escape sequence as hidden character. (go-gitea#18909) Remove CodeMirror dependencies (go-gitea#18911) Uncapitalize errors (go-gitea#18915) Disable service worker by default (go-gitea#18914) Set is_empty in fixtures (go-gitea#18869) Don't update email for organisation (go-gitea#18905) Correctly link URLs to users/repos with dashes, dots or underscores (go-gitea#18890) Set is_private in fixtures. (go-gitea#18868) Fix team management UI (go-gitea#18886) Update JS dependencies (go-gitea#18898) Fix migration v210 (go-gitea#18892) migrations: add test for importing pull requests in gitea uploader (go-gitea#18752)
2 parents c697b51 + 1563a45 commit 835165e

File tree

400 files changed

+1641
-62912
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

400 files changed

+1641
-62912
lines changed

.eslintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,7 @@ rules:
442442
unicorn/require-post-message-target-origin: [0]
443443
unicorn/string-content: [0]
444444
unicorn/template-indent: [2]
445+
unicorn/text-encoding-identifier-case: [0]
445446
unicorn/throw-new-error: [2]
446447
use-isnan: [2]
447448
valid-typeof: [2, {requireStringLiterals: true}]

.stylelintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ rules:
1414
declaration-block-no-redundant-longhand-properties: null
1515
declaration-block-single-line-max-declarations: null
1616
declaration-empty-line-before: null
17+
function-no-unknown: null
1718
hue-degree-notation: null
1819
indentation: 2
1920
max-line-length: null

custom/conf/app.example.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1115,7 +1115,7 @@ PATH =
11151115
;SEARCH_REPO_DESCRIPTION = true
11161116
;;
11171117
;; Whether to enable a Service Worker to cache frontend assets
1118-
;USE_SERVICE_WORKER = true
1118+
;USE_SERVICE_WORKER = false
11191119

11201120
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
11211121
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

docs/content/doc/advanced/config-cheat-sheet.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ The following configuration set `Content-Type: application/vnd.android.package-a
189189
add it to this config.
190190
- `DEFAULT_SHOW_FULL_NAME`: **false**: Whether the full name of the users should be shown where possible. If the full name isn't set, the username will be used.
191191
- `SEARCH_REPO_DESCRIPTION`: **true**: Whether to search within description at repository search on explore page.
192-
- `USE_SERVICE_WORKER`: **true**: Whether to enable a Service Worker to cache frontend assets.
192+
- `USE_SERVICE_WORKER`: **false**: Whether to enable a Service Worker to cache frontend assets.
193193

194194
### UI - Admin (`ui.admin`)
195195

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,6 @@ Before committing, make sure the linters pass:
185185
make lint-frontend
186186
```
187187

188-
Note: When working on frontend code, set `USE_SERVICE_WORKER` to `false` in `app.ini` to prevent undesirable caching of frontend assets.
189-
190188
### Configuring local ElasticSearch instance
191189

192190
Start local ElasticSearch instance using docker:

docs/content/doc/usage/reverse-proxies.en-us.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ server {
3030
3131
location / {
3232
proxy_pass http://localhost:3000;
33+
proxy_set_header Host $host;
34+
proxy_set_header X-Real-IP $remote_addr;
35+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
36+
proxy_set_header X-Forwarded-Proto $scheme;
3337
}
3438
}
3539
```
@@ -47,6 +51,10 @@ server {
4751
location /git/ {
4852
# Note: Trailing slash
4953
proxy_pass http://localhost:3000/;
54+
proxy_set_header Host $host;
55+
proxy_set_header X-Real-IP $remote_addr;
56+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
57+
proxy_set_header X-Forwarded-Proto $scheme;
5058
}
5159
}
5260
```

integrations/api_repo_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,6 @@ func TestAPIRepoTransfer(t *testing.T) {
468468
expectedStatus int
469469
}{
470470
// Disclaimer for test story: "user1" is an admin, "user2" is normal user and part of in owner team of org "user3"
471-
472471
// Transfer to a user with teams in another org should fail
473472
{ctxUserID: 1, newOwner: "user3", teams: &[]int64{5}, expectedStatus: http.StatusForbidden},
474473
// Transfer to a user with non-existent team IDs should fail
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ref: refs/heads/main
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[core]
2+
bare = true
3+
repositoryformatversion = 0
4+
filemode = false
5+
symlinks = false
6+
ignorecase = true

integrations/testlogger.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,11 @@ func (log *TestLogger) Init(config string) error {
181181
return nil
182182
}
183183

184+
// Content returns the content accumulated in the content provider
185+
func (log *TestLogger) Content() (string, error) {
186+
return "", fmt.Errorf("not supported")
187+
}
188+
184189
// Flush when log should be flushed
185190
func (log *TestLogger) Flush() {
186191
}

0 commit comments

Comments
 (0)