Skip to content

Commit 4a98ab0

Browse files
authored
Remove legacy template helper functions (#34426)
These functions have been marked as `panicIfDevOrTesting` since 1.23 (#32422)
1 parent 9b8609e commit 4a98ab0

File tree

4 files changed

+2
-108
lines changed

4 files changed

+2
-108
lines changed

modules/templates/helper.go

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -162,22 +162,6 @@ func NewFuncMap() template.FuncMap {
162162

163163
"FilenameIsImage": filenameIsImage,
164164
"TabSizeClass": tabSizeClass,
165-
166-
// for backward compatibility only, do not use them anymore
167-
"TimeSince": timeSinceLegacy,
168-
"TimeSinceUnix": timeSinceLegacy,
169-
"DateTime": dateTimeLegacy,
170-
171-
"RenderEmoji": renderEmojiLegacy,
172-
"RenderLabel": renderLabelLegacy,
173-
"RenderLabels": renderLabelsLegacy,
174-
"RenderIssueTitle": renderIssueTitleLegacy,
175-
176-
"RenderMarkdownToHtml": renderMarkdownToHtmlLegacy,
177-
178-
"RenderCommitMessage": renderCommitMessageLegacy,
179-
"RenderCommitMessageLinkSubject": renderCommitMessageLinkSubjectLegacy,
180-
"RenderCommitBody": renderCommitBodyLegacy,
181165
}
182166
}
183167

@@ -367,7 +351,3 @@ func QueryBuild(a ...any) template.URL {
367351
}
368352
return template.URL(s)
369353
}
370-
371-
func panicIfDevOrTesting() {
372-
setting.PanicInDevOrTesting("legacy template functions are for backward compatibility only, do not use them in new code")
373-
}

modules/templates/util_date_legacy.go

Lines changed: 0 additions & 23 deletions
This file was deleted.

modules/templates/util_date_test.go

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ func TestDateTime(t *testing.T) {
2323
du := NewDateUtils()
2424

2525
refTimeStr := "2018-01-01T00:00:00Z"
26-
refDateStr := "2018-01-01"
2726
refTime, _ := time.Parse(time.RFC3339, refTimeStr)
2827
refTimeStamp := timeutil.TimeStamp(refTime.Unix())
2928

@@ -32,18 +31,9 @@ func TestDateTime(t *testing.T) {
3231
assert.EqualValues(t, "-", du.AbsoluteShort(time.Time{}))
3332
assert.EqualValues(t, "-", du.AbsoluteShort(timeutil.TimeStamp(0)))
3433

35-
actual := dateTimeLegacy("short", "invalid")
36-
assert.EqualValues(t, `-`, actual)
37-
38-
actual = dateTimeLegacy("short", refTimeStr)
39-
assert.EqualValues(t, `<absolute-date weekday="" year="numeric" month="short" day="numeric" date="2018-01-01T00:00:00Z">2018-01-01</absolute-date>`, actual)
40-
41-
actual = du.AbsoluteShort(refTime)
34+
actual := du.AbsoluteShort(refTime)
4235
assert.EqualValues(t, `<absolute-date weekday="" year="numeric" month="short" day="numeric" date="2018-01-01T00:00:00Z">2018-01-01</absolute-date>`, actual)
4336

44-
actual = dateTimeLegacy("short", refDateStr)
45-
assert.EqualValues(t, `<absolute-date weekday="" year="numeric" month="short" day="numeric" date="2018-01-01T00:00:00-05:00">2018-01-01</absolute-date>`, actual)
46-
4737
actual = du.AbsoluteShort(refTimeStamp)
4838
assert.EqualValues(t, `<absolute-date weekday="" year="numeric" month="short" day="numeric" date="2017-12-31T19:00:00-05:00">2017-12-31</absolute-date>`, actual)
4939

@@ -69,6 +59,6 @@ func TestTimeSince(t *testing.T) {
6959
actual = timeSinceTo(&refTime, time.Time{})
7060
assert.EqualValues(t, `<relative-time prefix="" tense="future" datetime="2018-01-01T00:00:00Z" data-tooltip-content data-tooltip-interactive="true">2018-01-01 00:00:00 +00:00</relative-time>`, actual)
7161

72-
actual = timeSinceLegacy(timeutil.TimeStampNano(refTime.UnixNano()), nil)
62+
actual = du.TimeSince(timeutil.TimeStampNano(refTime.UnixNano()))
7363
assert.EqualValues(t, `<relative-time prefix="" tense="past" datetime="2017-12-31T19:00:00-05:00" data-tooltip-content data-tooltip-interactive="true">2017-12-31 19:00:00 -05:00</relative-time>`, actual)
7464
}

modules/templates/util_render_legacy.go

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)