2023-09-16 12:42:34 -05:00
|
|
|
{{if or .UsesIgnoreRevs .FaultyIgnoreRevsFile}}
|
|
|
|
{{$revsFileLink := URLJoin .RepoLink "src" .BranchNameSubURL "/.git-blame-ignore-revs"}}
|
|
|
|
{{if .UsesIgnoreRevs}}
|
|
|
|
<div class="ui info message">
|
2024-06-20 18:28:34 -05:00
|
|
|
<p>{{ctx.Locale.Tr "repo.blame.ignore_revs" $revsFileLink "?bypass-blame-ignore=true"}}</p>
|
2023-09-16 12:42:34 -05:00
|
|
|
</div>
|
|
|
|
{{else}}
|
|
|
|
<div class="ui error message">
|
2024-03-10 03:51:19 -05:00
|
|
|
<p>{{ctx.Locale.Tr "repo.blame.ignore_revs.failed" $revsFileLink}}</p>
|
2023-09-16 12:42:34 -05:00
|
|
|
</div>
|
|
|
|
{{end}}
|
|
|
|
{{end}}
|
2020-06-15 13:39:39 -05:00
|
|
|
<div class="{{TabSizeClass .Editorconfig .FileName}} non-diff-file-content">
|
2024-03-22 14:51:29 -05:00
|
|
|
<h4 class="file-header ui top attached header tw-flex tw-items-center tw-justify-between tw-flex-wrap">
|
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
(cherry picked from commit 68ec9b48592fe88765bcc3a73093d43c98b315de)
Conflicts:
routers/web/repo/view.go
templates/base/head_navbar.tmpl
templates/repo/code/recently_pushed_new_branches.tmpl
templates/repo/diff/box.tmpl
templates/repo/diff/compare.tmpl
templates/repo/diff/conversation.tmpl
templates/repo/header.tmpl
templates/repo/issue/filter_list.tmpl
templates/repo/issue/view_content/conversation.tmpl
templates/repo/issue/view_content/sidebar.tmpl
templates/repo/settings/options.tmpl
templates/repo/view_file.tmpl
templates/shared/user/blocked_users.tmpl
templates/status/500.tmpl
web_src/js/components/DashboardRepoList.vue
resolved by prefering Forgejo version and applying the
commands to all files
2024-03-24 11:42:49 -05:00
|
|
|
<div class="file-header-left tw-flex tw-items-center tw-py-2 tw-pr-4">
|
2022-11-19 06:08:06 -05:00
|
|
|
{{template "repo/file_info" .}}
|
2020-06-15 13:39:39 -05:00
|
|
|
</div>
|
2024-03-22 14:51:29 -05:00
|
|
|
<div class="file-header-right file-actions tw-flex tw-items-center tw-flex-wrap">
|
2020-11-01 15:04:26 -05:00
|
|
|
<div class="ui buttons">
|
2023-09-25 03:56:50 -05:00
|
|
|
<a class="ui tiny button" href="{{$.RawFileLink}}">{{ctx.Locale.Tr "repo.file_raw"}}</a>
|
2020-11-01 15:04:26 -05:00
|
|
|
{{if not .IsViewCommit}}
|
2023-09-25 03:56:50 -05:00
|
|
|
<a class="ui tiny button" href="{{.RepoLink}}/src/commit/{{.CommitID | PathEscape}}/{{.TreePath | PathEscapeSegments}}">{{ctx.Locale.Tr "repo.file_permalink"}}</a>
|
2020-11-01 15:04:26 -05:00
|
|
|
{{end}}
|
2023-09-25 03:56:50 -05:00
|
|
|
<a class="ui tiny button" href="{{.RepoLink}}/src/{{.BranchNameSubURL}}/{{.TreePath | PathEscapeSegments}}">{{ctx.Locale.Tr "repo.normal_view"}}</a>
|
|
|
|
<a class="ui tiny button" href="{{.RepoLink}}/commits/{{.BranchNameSubURL}}/{{.TreePath | PathEscapeSegments}}">{{ctx.Locale.Tr "repo.file_history"}}</a>
|
|
|
|
<button class="ui tiny button unescape-button">{{ctx.Locale.Tr "repo.unescape_control_characters"}}</button>
|
2024-03-24 13:23:38 -05:00
|
|
|
<button class="ui tiny button escape-button tw-hidden">{{ctx.Locale.Tr "repo.escape_control_characters"}}</button>
|
2019-04-19 21:47:00 -05:00
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</h4>
|
2024-04-18 03:34:23 -05:00
|
|
|
<div class="ui bottom attached table unstackable segment">
|
2022-01-06 20:18:52 -05:00
|
|
|
<div class="file-view code-view unicode-escaped">
|
2024-02-19 08:32:37 -05:00
|
|
|
{{if .IsFileTooLarge}}
|
|
|
|
<table>
|
|
|
|
<tbody>
|
|
|
|
<tr>
|
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
(cherry picked from commit 68ec9b48592fe88765bcc3a73093d43c98b315de)
Conflicts:
routers/web/repo/view.go
templates/base/head_navbar.tmpl
templates/repo/code/recently_pushed_new_branches.tmpl
templates/repo/diff/box.tmpl
templates/repo/diff/compare.tmpl
templates/repo/diff/conversation.tmpl
templates/repo/header.tmpl
templates/repo/issue/filter_list.tmpl
templates/repo/issue/view_content/conversation.tmpl
templates/repo/issue/view_content/sidebar.tmpl
templates/repo/settings/options.tmpl
templates/repo/view_file.tmpl
templates/shared/user/blocked_users.tmpl
templates/status/500.tmpl
web_src/js/components/DashboardRepoList.vue
resolved by prefering Forgejo version and applying the
commands to all files
2024-03-24 11:42:49 -05:00
|
|
|
<td class="gt-text-center tw-p-0.5"><strong>{{ctx.Locale.Tr "repo.file_too_large"}}</strong></td>
|
2024-02-19 08:32:37 -05:00
|
|
|
</tr>
|
|
|
|
</tbody>
|
|
|
|
</table>
|
|
|
|
{{else}}
|
2020-06-15 13:39:39 -05:00
|
|
|
<table>
|
|
|
|
<tbody>
|
2021-06-27 18:13:20 -05:00
|
|
|
{{range $row := .BlameRows}}
|
|
|
|
<tr class="{{if and (gt $.CommitCnt 1) ($row.CommitMessage)}}top-line-blame{{end}}">
|
|
|
|
<td class="lines-commit">
|
|
|
|
<div class="blame-info">
|
|
|
|
<div class="blame-data">
|
|
|
|
<div class="blame-avatar">
|
|
|
|
{{$row.Avatar}}
|
|
|
|
</div>
|
|
|
|
<div class="blame-message">
|
2024-03-24 07:14:03 -05:00
|
|
|
<a class="suppressed tw-text-text" href="{{$row.CommitURL}}" title="{{$row.CommitMessage}}">
|
2021-06-27 18:13:20 -05:00
|
|
|
{{$row.CommitMessage}}
|
|
|
|
</a>
|
|
|
|
</div>
|
2024-03-24 07:14:03 -05:00
|
|
|
<div class="blame-time not-mobile">
|
2021-06-27 18:13:20 -05:00
|
|
|
{{$row.CommitSince}}
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</td>
|
|
|
|
<td class="lines-blame-btn">
|
|
|
|
{{if $row.PreviousSha}}
|
2024-03-24 07:14:03 -05:00
|
|
|
<a role="button" class="muted" href="{{$row.PreviousShaURL}}" data-tooltip-content='{{ctx.Locale.Tr "repo.blame_prior"}}'>
|
2021-06-27 18:13:20 -05:00
|
|
|
{{svg "octicon-versions"}}
|
|
|
|
</a>
|
|
|
|
{{end}}
|
|
|
|
</td>
|
|
|
|
<td class="lines-num">
|
|
|
|
<span id="L{{$row.RowNumber}}" data-line-number="{{$row.RowNumber}}"></span>
|
|
|
|
</td>
|
2022-01-06 20:18:52 -05:00
|
|
|
{{if $.EscapeStatus.Escaped}}
|
2022-08-13 13:32:34 -05:00
|
|
|
<td class="lines-escape">
|
|
|
|
{{if $row.EscapeStatus.Escaped}}
|
2023-09-24 15:31:58 -05:00
|
|
|
<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $row}}"></button>
|
2022-08-13 13:32:34 -05:00
|
|
|
{{end}}
|
|
|
|
</td>
|
2022-01-06 20:18:52 -05:00
|
|
|
{{end}}
|
2023-06-14 13:17:58 -05:00
|
|
|
<td rel="L{{$row.RowNumber}}" class="lines-code blame-code chroma">
|
2024-07-04 06:46:31 -05:00
|
|
|
<code class="code-inner">{{$row.Code}}</code>
|
2021-06-27 18:13:20 -05:00
|
|
|
</td>
|
|
|
|
</tr>
|
|
|
|
{{end}}
|
2020-06-15 13:39:39 -05:00
|
|
|
</tbody>
|
|
|
|
</table>
|
2024-03-24 07:14:03 -05:00
|
|
|
<div class="code-line-menu tippy-target">
|
|
|
|
{{if $.Permission.CanRead $.UnitTypeIssues}}
|
|
|
|
<a class="item ref-in-new-issue" role="menuitem" data-url-issue-new="{{.RepoLink}}/issues/new" data-url-param-body-link="{{.Repository.Link}}/src/commit/{{PathEscape .CommitID}}/{{PathEscapeSegments .TreePath}}{{if $.HasSourceRenderedToggle}}?display=source{{end}}" rel="nofollow noindex">{{ctx.Locale.Tr "repo.issues.context.reference_issue"}}</a>
|
|
|
|
{{end}}
|
|
|
|
<a class="item copy-line-permalink" role="menuitem" data-url="{{.Repository.Link}}/src/commit/{{PathEscape .CommitID}}/{{PathEscapeSegments .TreePath}}{{if $.HasSourceRenderedToggle}}?display=source{{end}}">{{ctx.Locale.Tr "repo.file_copy_permalink"}}</a>
|
|
|
|
</div>
|
2024-02-19 08:32:37 -05:00
|
|
|
{{end}}
|
2020-06-15 13:39:39 -05:00
|
|
|
</div>
|
2021-04-10 22:46:37 -05:00
|
|
|
</div>
|
2019-07-22 21:12:09 -05:00
|
|
|
</div>
|