Skip to content

Commit 58802bd

Browse files
committed
Fix histroy conflicts
1 parent 4e52afb commit 58802bd

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

templates/repo/home.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
</div>
7171
{{end}}
7272
<div class="fitted item mx-0">
73-
<a href="{{.BaseRepo.Link}}/find/{{.BranchName | EscapePound}}">
73+
<a href="{{.BaseRepo.Link}}/find/{{.BranchName | PathEscapeSegments}}">
7474
<button id="new-pull-request" class="ui compact basic button">{{.i18n.Tr "action.find_file"}}</button>
7575
</a>
7676
</div>

web_src/js/features/find.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {svg} from '../svg.js';
2-
const {AppSubUrl, csrf} = window.config;
2+
const {appSubUrl, csrf} = window.config;
33

44
const threshold = 50;
55
let files = [];
@@ -134,7 +134,7 @@ async function fetchRepoFiles() {
134134
const branchName = $('#branchName').val();
135135
const data = await $.ajax({
136136
type: 'GET',
137-
url: `${AppSubUrl}/api/v1/repos/${ownerName}/${repoName}/find/${branchName}`,
137+
url: `${appSubUrl}/api/v1/repos/${ownerName}/${repoName}/find/${branchName}`,
138138
headers: {'X-Csrf-Token': csrf}
139139
});
140140
if (data) {

0 commit comments

Comments
 (0)