Skip to content

Commit 7baa6fa

Browse files
GiteaBotwxiaoguang
andauthored
Fix some trivial problems (#34579) (#34585)
Backport #34579 by wxiaoguang See the comments Co-authored-by: wxiaoguang <[email protected]>
1 parent f9a0b07 commit 7baa6fa

File tree

8 files changed

+46
-12
lines changed

8 files changed

+46
-12
lines changed

models/activities/user_heatmap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func getUserHeatmapData(ctx context.Context, user *user_model.User, team *organi
6666
Select(groupBy+" AS timestamp, count(user_id) as contributions").
6767
Table("action").
6868
Where(cond).
69-
And("created_unix > ?", timeutil.TimeStampNow()-31536000).
69+
And("created_unix > ?", timeutil.TimeStampNow()-(366+7)*86400). // (366+7) days to include the first week for the heatmap
7070
GroupBy(groupByName).
7171
OrderBy("timestamp").
7272
Find(&hdata)

modules/git/languagestats/language_stats_nogogit.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,17 @@ func GetLanguageStats(repo *git.Repository, commitID string) (map[string]int64,
9797
}
9898

9999
isVendored := optional.None[bool]()
100-
isGenerated := optional.None[bool]()
101100
isDocumentation := optional.None[bool]()
102101
isDetectable := optional.None[bool]()
103102

104103
attrs, err := checker.CheckPath(f.Name())
104+
attrLinguistGenerated := optional.None[bool]()
105105
if err == nil {
106106
if isVendored = attrs.GetVendored(); isVendored.ValueOrDefault(false) {
107107
continue
108108
}
109109

110-
if isGenerated = attrs.GetGenerated(); isGenerated.ValueOrDefault(false) {
110+
if attrLinguistGenerated = attrs.GetGenerated(); attrLinguistGenerated.ValueOrDefault(false) {
111111
continue
112112
}
113113

@@ -169,7 +169,15 @@ func GetLanguageStats(repo *git.Repository, commitID string) (map[string]int64,
169169
return nil, err
170170
}
171171
}
172-
if !isGenerated.Has() && enry.IsGenerated(f.Name(), content) {
172+
173+
// if "generated" attribute is set, use it, otherwise use enry.IsGenerated to guess
174+
var isGenerated bool
175+
if attrLinguistGenerated.Has() {
176+
isGenerated = attrLinguistGenerated.Value()
177+
} else {
178+
isGenerated = enry.IsGenerated(f.Name(), content)
179+
}
180+
if isGenerated {
173181
continue
174182
}
175183

modules/web/routing/logger.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,10 @@ func logPrinter(logger log.Logger) func(trigger Event, record *requestRecord) {
103103
status = v.WrittenStatus()
104104
}
105105
logf := logInfo
106-
if strings.HasPrefix(req.RequestURI, "/assets/") {
106+
// lower the log level for some specific requests, in most cases these logs are not useful
107+
if strings.HasPrefix(req.RequestURI, "/assets/") /* static assets */ ||
108+
req.RequestURI == "/user/events" /* Server-Sent Events (SSE) handler */ ||
109+
req.RequestURI == "/api/actions/runner.v1.RunnerService/FetchTask" /* Actions Runner polling */ {
107110
logf = logTrace
108111
}
109112
message := completedMessage

routers/api/packages/container/container.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ func serveBlob(ctx *context.Context, pfd *packages_model.PackageFileDescriptor)
721721
if u != nil {
722722
headers.Status = http.StatusTemporaryRedirect
723723
headers.Location = u.String()
724-
724+
headers.ContentLength = 0 // do not set Content-Length for redirect responses
725725
setResponseHeaders(ctx.Resp, headers)
726726
return
727727
}

services/repository/generate.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,8 @@ type expansion struct {
4242
var defaultTransformers = []transformer{
4343
{Name: "SNAKE", Transform: xstrings.ToSnakeCase},
4444
{Name: "KEBAB", Transform: xstrings.ToKebabCase},
45-
{Name: "CAMEL", Transform: func(str string) string {
46-
return xstrings.FirstRuneToLower(xstrings.ToCamelCase(str))
47-
}},
48-
{Name: "PASCAL", Transform: xstrings.ToCamelCase},
45+
{Name: "CAMEL", Transform: xstrings.ToCamelCase},
46+
{Name: "PASCAL", Transform: xstrings.ToPascalCase},
4947
{Name: "LOWER", Transform: strings.ToLower},
5048
{Name: "UPPER", Transform: strings.ToUpper},
5149
{Name: "TITLE", Transform: util.ToTitleCase},

services/repository/generate_test.go

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"testing"
88

99
"github.com/stretchr/testify/assert"
10+
"github.com/stretchr/testify/require"
1011
)
1112

1213
var giteaTemplate = []byte(`
@@ -65,3 +66,26 @@ func TestFileNameSanitize(t *testing.T) {
6566
assert.Equal(t, "_", fileNameSanitize("\u0000"))
6667
assert.Equal(t, "目标", fileNameSanitize("目标"))
6768
}
69+
70+
func TestTransformers(t *testing.T) {
71+
cases := []struct {
72+
name string
73+
expected string
74+
}{
75+
{"SNAKE", "abc_def_xyz"},
76+
{"KEBAB", "abc-def-xyz"},
77+
{"CAMEL", "abcDefXyz"},
78+
{"PASCAL", "AbcDefXyz"},
79+
{"LOWER", "abc_def-xyz"},
80+
{"UPPER", "ABC_DEF-XYZ"},
81+
{"TITLE", "Abc_def-Xyz"},
82+
}
83+
84+
input := "Abc_Def-XYZ"
85+
assert.Len(t, defaultTransformers, len(cases))
86+
for i, c := range cases {
87+
tf := defaultTransformers[i]
88+
require.Equal(t, c.name, tf.Name)
89+
assert.Equal(t, c.expected, tf.Transform(input), "case %s", c.name)
90+
}
91+
}

templates/repo/empty.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<h3>{{ctx.Locale.Tr "repo.create_new_repo_command"}}</h3>
4848
<div class="markup">
4949
<pre><code>touch README.md
50-
git init
50+
git init{{if ne .Repository.ObjectFormatName "sha1"}} --object-format={{.Repository.ObjectFormatName}}{{end}}{{/* for sha256 repo, it needs to set "object-format" explicitly*/}}
5151
{{if ne .Repository.DefaultBranch "master"}}git checkout -b {{.Repository.DefaultBranch}}{{end}}
5252
git add README.md
5353
git commit -m "first commit"

web_src/js/components/RepoActionView.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,8 @@ export default defineComponent({
439439
});
440440
</script>
441441
<template>
442-
<div class="ui container action-view-container">
442+
<!-- make the view container full width to make users easier to read logs -->
443+
<div class="ui fluid container">
443444
<div class="action-view-header">
444445
<div class="action-info-summary">
445446
<div class="action-info-summary-title">

0 commit comments

Comments
 (0)